diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-05 15:36:21 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-05 15:36:21 +0000 |
| commit | e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc (patch) | |
| tree | e8f3e6f1bbbbdabe43c09ba55bca2e6098daef4d /Magic2 | |
| parent | ad61263fe195a5975f986a7f23d767ef777ca22d (diff) | |
| download | starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.zip starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.gz starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.bz2 | |
REdoing r71, without the mistakes
Diffstat (limited to 'Magic2')
| -rw-r--r-- | Magic2/Magic.vcxproj | 26 | ||||
| -rw-r--r-- | Magic2/Magic.vcxproj.filters | 6 |
2 files changed, 7 insertions, 25 deletions
diff --git a/Magic2/Magic.vcxproj b/Magic2/Magic.vcxproj index ccbd771..3a9ebb2 100644 --- a/Magic2/Magic.vcxproj +++ b/Magic2/Magic.vcxproj @@ -68,31 +68,28 @@ <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -110,19 +107,14 @@ <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug x64|Win32'">
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'">
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -272,11 +264,6 @@ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
- <CustomBuildStep>
- <Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)$(TargetFileName)"</Command>
- <Outputs>$(STARSHATTERPATH)\$(TargetFileName);%(Outputs)</Outputs>
- <Inputs>$(TargetFileName)</Inputs>
- </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'">
<ClCompile>
@@ -322,11 +309,6 @@ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
- <CustomBuildStep>
- <Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)$(TargetFileName)"</Command>
- <Outputs>$(STARSHATTERPATH)\$(TargetFileName);%(Outputs)</Outputs>
- <Inputs>$(TargetFileName)</Inputs>
- </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -767,12 +749,12 @@ <ClCompile Include="..\Parser\Token.cpp" />
<ClCompile Include="UVMapView.cpp" />
<ClCompile Include="..\nGenEx\Video.cpp" />
+ <ClCompile Include="..\nGenEx\VideoDX9.cpp" />
<ClCompile Include="..\nGenEx\VideoDX9Enum.cpp" />
<ClCompile Include="..\nGenEx\VideoDX9VertexBuffer.cpp" />
<ClCompile Include="..\nGenEx\VideoFactory.cpp" />
<ClCompile Include="..\nGenEx\VideoSettings.cpp" />
<ClCompile Include="..\nGenEx\Window.cpp" />
- <ClCompile Include="VideoDX9.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Magic.rc" />
diff --git a/Magic2/Magic.vcxproj.filters b/Magic2/Magic.vcxproj.filters index ad70c58..1ed7515 100644 --- a/Magic2/Magic.vcxproj.filters +++ b/Magic2/Magic.vcxproj.filters @@ -288,6 +288,9 @@ <ClCompile Include="..\nGenEx\Video.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\nGenEx\VideoDX9.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\nGenEx\VideoDX9Enum.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -312,9 +315,6 @@ <ClCompile Include="Locale_ss.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="VideoDX9.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Magic.rc">
|