ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx: attempting to fix vs2010 project files, I don't have it installed anymore. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5653 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11@gmail.com 2013-06-10 18:48:14 +00:00
parent 43c7235cc3
commit a5103a28e7
6 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GSUtil.cpp
View File

@ -62,7 +62,9 @@ const char* GSUtil::GetLibName()
sl.push_back(format("GCC %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)); sl.push_back(format("GCC %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
#endif #endif
#if _M_SSE >= 0x500 #if _M_SSE >= 0x501
sl.push_back("AVX2");
#elif _M_SSE >= 0x500
sl.push_back("AVX"); sl.push_back("AVX");
#elif _M_SSE >= 0x402 #elif _M_SSE >= 0x402
sl.push_back("SSE42"); sl.push_back("SSE42");

8
plugins/GSdx/GSdx.vcxproj
View File

@ -160,7 +160,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs10.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\release.props" /> <Import Project="vsprops\release.props" />
<Import Project="vsprops\x86.props" /> <Import Project="vsprops\x86.props" />
@ -176,7 +176,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs10.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\debug.props" /> <Import Project="vsprops\debug.props" />
<Import Project="vsprops\x86.props" /> <Import Project="vsprops\x86.props" />
@ -224,7 +224,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs10.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\release.props" /> <Import Project="vsprops\release.props" />
<Import Project="vsprops\x64.props" /> <Import Project="vsprops\x64.props" />
@ -240,7 +240,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs10.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\debug.props" /> <Import Project="vsprops\debug.props" />
<Import Project="vsprops\x64.props" /> <Import Project="vsprops\x64.props" />

8
plugins/GSdx/GSdx_vs11.vcxproj
View File

@ -214,7 +214,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs11.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\release.props" /> <Import Project="vsprops\release.props" />
<Import Project="vsprops\x86.props" /> <Import Project="vsprops\x86.props" />
@ -238,7 +238,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs11.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\debug.props" /> <Import Project="vsprops\debug.props" />
<Import Project="vsprops\x86.props" /> <Import Project="vsprops\x86.props" />
@ -294,7 +294,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs11.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\release.props" /> <Import Project="vsprops\release.props" />
<Import Project="vsprops\x64.props" /> <Import Project="vsprops\x64.props" />
@ -318,7 +318,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="vsprops\ProjectRootDir.props" /> <Import Project="vsprops\ProjectRootDir.props" />
<Import Project="vsprops\avx.props" /> <Import Project="vsprops\avx_vs11.props" />
<Import Project="vsprops\common.props" /> <Import Project="vsprops\common.props" />
<Import Project="vsprops\debug.props" /> <Import Project="vsprops\debug.props" />
<Import Project="vsprops\x64.props" /> <Import Project="vsprops\x64.props" />

1
plugins/GSdx/vsprops/avx2.props
View File

@ -9,7 +9,6 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_M_SSE=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_M_SSE=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>

20
plugins/GSdx/vsprops/avx_vs10.props Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<SSEtype>AVX</SSEtype>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_M_SSE=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="SSEtype">
<Value>$(SSEtype)</Value>
</BuildMacro>
</ItemGroup>
</Project>

39
plugins/GSdx/vsprops/avx.props → plugins/GSdx/vsprops/avx_vs11.props
View File

@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<SSEtype>AVX</SSEtype> <SSEtype>AVX</SSEtype>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_M_SSE=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_M_SSE=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet> </ClCompile>
</ClCompile> </ItemDefinitionGroup>
</ItemDefinitionGroup> <ItemGroup>
<ItemGroup> <BuildMacro Include="SSEtype">
<BuildMacro Include="SSEtype"> <Value>$(SSEtype)</Value>
<Value>$(SSEtype)</Value> </BuildMacro>
</BuildMacro> </ItemGroup>
</ItemGroup>
</Project> </Project>