summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-06-05 15:36:21 +0000
committerFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-06-05 15:36:21 +0000
commite3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc (patch)
treee8f3e6f1bbbbdabe43c09ba55bca2e6098daef4d
parentad61263fe195a5975f986a7f23d767ef777ca22d (diff)
downloadstarshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.zip
starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.gz
starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.bz2
REdoing r71, without the mistakes
-rw-r--r--Datafile/Datafile.vcxproj4
-rw-r--r--Magic2/Magic.vcxproj26
-rw-r--r--Magic2/Magic.vcxproj.filters6
-rw-r--r--NetEx/NetEx.vcxproj16
-rw-r--r--Opcode/Opcode.vcxproj16
-rw-r--r--Stars45/Stars.vcxproj28
-rw-r--r--Starshatter/StarshatterVS2011.sln68
-rw-r--r--libpng/libpng.vcxproj34
-rw-r--r--nGenEx/ActiveWindow.h4
-rw-r--r--nGenEx/D3DXImage.cpp13
-rw-r--r--nGenEx/nGenEx.vcxproj16
-rw-r--r--zlib/Zlib.vcxproj16
12 files changed, 41 insertions, 206 deletions
diff --git a/Datafile/Datafile.vcxproj b/Datafile/Datafile.vcxproj
index 28e1d12..ff7aadb 100644
--- a/Datafile/Datafile.vcxproj
+++ b/Datafile/Datafile.vcxproj
@@ -36,7 +36,6 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -49,14 +48,12 @@
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -120,6 +117,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>..\zlib\debug\zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>LIBCMTD</IgnoreSpecificDefaultLibraries>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
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">
diff --git a/NetEx/NetEx.vcxproj b/NetEx/NetEx.vcxproj
index ff8a50d..49c2be5 100644
--- a/NetEx/NetEx.vcxproj
+++ b/NetEx/NetEx.vcxproj
@@ -67,11 +67,9 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -83,31 +81,28 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -125,19 +120,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</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">
diff --git a/Opcode/Opcode.vcxproj b/Opcode/Opcode.vcxproj
index de19c9e..f41595b 100644
--- a/Opcode/Opcode.vcxproj
+++ b/Opcode/Opcode.vcxproj
@@ -67,11 +67,9 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -83,31 +81,28 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -125,19 +120,14 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</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">
diff --git a/Stars45/Stars.vcxproj b/Stars45/Stars.vcxproj
index a185123..9176914 100644
--- a/Stars45/Stars.vcxproj
+++ b/Stars45/Stars.vcxproj
@@ -67,11 +67,9 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -85,46 +83,43 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
+ <UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
<PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
+ <UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
<PlatformToolset>v110</PlatformToolset>
@@ -134,20 +129,15 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Static</UseOfAtl>
- <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">
@@ -321,8 +311,9 @@
<OutputFile>$(SolutionDir)$(Configuration)\Starshatter_D.exe</OutputFile>
<AdditionalDependencies>..\Opcode\Debug\Opcode_D.lib;..\ngenex\debug\ngenex.lib;..\netex\debug\netex.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;Vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>libcmt.lib;</IgnoreSpecificDefaultLibraries>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+ <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
</Link>
<CustomBuildStep>
<Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)$(TargetFileName)"</Command>
@@ -372,8 +363,9 @@
<OutputFile>$(SolutionDir)$(Configuration)\Starshatter_D.exe</OutputFile>
<AdditionalDependencies>..\Opcode\Debug\Opcode_D.lib;..\ngenex\debug\ngenex.lib;..\netex\debug\netex.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;Vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>libcmt.lib;</IgnoreSpecificDefaultLibraries>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+ <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
</Link>
<CustomBuildStep>
<Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)$(TargetFileName)"</Command>
@@ -521,6 +513,7 @@
<AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+ <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
</Link>
<CustomBuildStep>
<Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)"</Command>
@@ -572,6 +565,7 @@
<AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+ <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
</Link>
<CustomBuildStep>
<Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)"</Command>
diff --git a/Starshatter/StarshatterVS2011.sln b/Starshatter/StarshatterVS2011.sln
index 42fded2..4df2f37 100644
--- a/Starshatter/StarshatterVS2011.sln
+++ b/Starshatter/StarshatterVS2011.sln
@@ -5,7 +5,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Magic", "..\Magic2\Magic.vc
ProjectSection(ProjectDependencies) = postProject
{0F2DDC75-EE37-902B-0247-63A8EB8CD687} = {0F2DDC75-EE37-902B-0247-63A8EB8CD687}
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7} = {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}
+ {574D6A73-F38F-30E0-0F30-64AD0378B426} = {574D6A73-F38F-30E0-0F30-64AD0378B426}
{86C01EAC-2406-40A7-B744-AA858B7607A9} = {86C01EAC-2406-40A7-B744-AA858B7607A9}
+ {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1} = {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetEx", "..\NetEx\NetEx.vcxproj", "{574D6A73-F38F-30E0-0F30-64AD0378B426}"
@@ -36,14 +38,10 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug VS2012|Win32 = Debug VS2012|Win32
Debug VS2012|x64 = Debug VS2012|x64
- Debug x64|Win32 = Debug x64|Win32
- Debug x64|x64 = Debug x64|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release VS2012|Win32 = Release VS2012|Win32
Release VS2012|x64 = Release VS2012|x64
- Release x64|Win32 = Release x64|Win32
- Release x64|x64 = Release x64|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
@@ -52,10 +50,6 @@ Global
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug VS2012|x64.ActiveCfg = Debug VS2012|x64
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug VS2012|x64.Build.0 = Debug VS2012|x64
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug x64|Win32.ActiveCfg = Debug x64|Win32
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug x64|Win32.Build.0 = Debug x64|Win32
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug x64|x64.ActiveCfg = Template|x64
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug x64|x64.Build.0 = Debug x64|x64
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug|Win32.ActiveCfg = Debug|Win32
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug|Win32.Build.0 = Debug|Win32
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Debug|x64.ActiveCfg = Debug|x64
@@ -64,10 +58,6 @@ Global
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release VS2012|x64.ActiveCfg = Release VS2012|x64
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release VS2012|x64.Build.0 = Release VS2012|x64
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release x64|Win32.ActiveCfg = Release x64|Win32
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release x64|Win32.Build.0 = Release x64|Win32
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release x64|x64.ActiveCfg = Release x64|x64
- {0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release x64|x64.Build.0 = Release x64|x64
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release|Win32.ActiveCfg = Release|Win32
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release|Win32.Build.0 = Release|Win32
{0F2DDC75-EE37-902B-0247-63A8EB8CD687}.Release|x64.ActiveCfg = Release|x64
@@ -76,10 +66,6 @@ Global
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug VS2012|x64.ActiveCfg = Debug VS2012|x64
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug VS2012|x64.Build.0 = Debug VS2012|x64
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug x64|Win32.ActiveCfg = Debug x64|Win32
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug x64|Win32.Build.0 = Debug x64|Win32
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug x64|x64.ActiveCfg = Template|x64
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug x64|x64.Build.0 = Debug x64|x64
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug|Win32.ActiveCfg = Debug|Win32
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug|Win32.Build.0 = Debug|Win32
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Debug|x64.ActiveCfg = Debug|x64
@@ -88,10 +74,6 @@ Global
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release VS2012|x64.ActiveCfg = Release VS2012|x64
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release VS2012|x64.Build.0 = Release VS2012|x64
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release x64|Win32.ActiveCfg = Release x64|Win32
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release x64|Win32.Build.0 = Release x64|Win32
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release x64|x64.ActiveCfg = Release x64|x64
- {552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release x64|x64.Build.0 = Release x64|x64
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release|Win32.ActiveCfg = Release|Win32
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release|Win32.Build.0 = Release|Win32
{552BEAB0-D371-E491-5C0E-ADA78BA2FDD7}.Release|x64.ActiveCfg = Release|x64
@@ -100,10 +82,6 @@ Global
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug VS2012|x64.ActiveCfg = Debug VS2012|x64
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug VS2012|x64.Build.0 = Debug VS2012|x64
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug x64|Win32.ActiveCfg = Debug x64|Win32
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug x64|Win32.Build.0 = Debug x64|Win32
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug x64|x64.ActiveCfg = Template|x64
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug x64|x64.Build.0 = Debug x64|x64
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug|Win32.ActiveCfg = Debug|Win32
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug|Win32.Build.0 = Debug|Win32
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Debug|x64.ActiveCfg = Debug|x64
@@ -112,10 +90,6 @@ Global
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Release VS2012|x64.ActiveCfg = Release VS2012|x64
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Release VS2012|x64.Build.0 = Release VS2012|x64
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Release x64|Win32.ActiveCfg = Release x64|Win32
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Release x64|Win32.Build.0 = Release x64|Win32
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Release x64|x64.ActiveCfg = Release x64|x64
- {574D6A73-F38F-30E0-0F30-64AD0378B426}.Release x64|x64.Build.0 = Release x64|x64
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Release|Win32.ActiveCfg = Release|Win32
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Release|Win32.Build.0 = Release|Win32
{574D6A73-F38F-30E0-0F30-64AD0378B426}.Release|x64.ActiveCfg = Release|x64
@@ -124,10 +98,6 @@ Global
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug VS2012|x64.ActiveCfg = Debug VS2012|x64
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug VS2012|x64.Build.0 = Debug VS2012|x64
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug x64|Win32.ActiveCfg = Debug x64|Win32
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug x64|Win32.Build.0 = Debug x64|Win32
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug x64|x64.ActiveCfg = Debug Inferno SSE2|x64
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug x64|x64.Build.0 = Debug x64|x64
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug|Win32.ActiveCfg = Debug|Win32
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug|Win32.Build.0 = Debug|Win32
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Debug|x64.ActiveCfg = Debug|x64
@@ -136,10 +106,6 @@ Global
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Release VS2012|x64.ActiveCfg = Release VS2012|x64
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Release VS2012|x64.Build.0 = Release VS2012|x64
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Release x64|Win32.ActiveCfg = Release x64|Win32
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Release x64|Win32.Build.0 = Release x64|Win32
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Release x64|x64.ActiveCfg = Release x64|x64
- {86C01EAC-2406-40A7-B744-AA858B7607A9}.Release x64|x64.Build.0 = Release x64|x64
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Release|Win32.ActiveCfg = Release|Win32
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Release|Win32.Build.0 = Release|Win32
{86C01EAC-2406-40A7-B744-AA858B7607A9}.Release|x64.ActiveCfg = Release|x64
@@ -147,18 +113,12 @@ Global
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug VS2012|Win32.ActiveCfg = Debug VS2012|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug VS2012|x64.ActiveCfg = Debug VS2012|Win32
- {ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug x64|Win32.ActiveCfg = Debug|Win32
- {ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug x64|Win32.Build.0 = Debug|Win32
- {ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug x64|x64.ActiveCfg = Debug|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug|Win32.ActiveCfg = Debug|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug|Win32.Build.0 = Debug|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Debug|x64.ActiveCfg = Debug|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release VS2012|Win32.ActiveCfg = Release VS2012|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release VS2012|x64.ActiveCfg = Release VS2012|Win32
- {ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release x64|Win32.ActiveCfg = Release|Win32
- {ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release x64|Win32.Build.0 = Release|Win32
- {ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release x64|x64.ActiveCfg = Release|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release|Win32.ActiveCfg = Release|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release|Win32.Build.0 = Release|Win32
{ADBA4106-AFE3-43D2-88D9-308A7D75E372}.Release|x64.ActiveCfg = Release|Win32
@@ -166,10 +126,6 @@ Global
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug VS2012|x64.ActiveCfg = Debug VS2012|x64
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug VS2012|x64.Build.0 = Debug VS2012|x64
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug x64|Win32.ActiveCfg = Debug x64|Win32
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug x64|Win32.Build.0 = Debug x64|Win32
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug x64|x64.ActiveCfg = Template|x64
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug x64|x64.Build.0 = Debug x64|x64
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug|Win32.ActiveCfg = Debug|Win32
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug|Win32.Build.0 = Debug|Win32
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Debug|x64.ActiveCfg = Debug|x64
@@ -178,10 +134,6 @@ Global
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release VS2012|x64.ActiveCfg = Release VS2012|x64
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release VS2012|x64.Build.0 = Release VS2012|x64
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release x64|Win32.ActiveCfg = Release x64|Win32
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release x64|Win32.Build.0 = Release x64|Win32
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release x64|x64.ActiveCfg = Release x64|x64
- {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release x64|x64.Build.0 = Release x64|x64
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release|Win32.ActiveCfg = Release|Win32
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release|Win32.Build.0 = Release|Win32
{CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1}.Release|x64.ActiveCfg = Release|x64
@@ -190,10 +142,6 @@ Global
{D794137F-03CC-7930-2629-534566E26E2E}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{D794137F-03CC-7930-2629-534566E26E2E}.Debug VS2012|x64.ActiveCfg = Debug VS2012|x64
{D794137F-03CC-7930-2629-534566E26E2E}.Debug VS2012|x64.Build.0 = Debug VS2012|x64
- {D794137F-03CC-7930-2629-534566E26E2E}.Debug x64|Win32.ActiveCfg = Debug x64|Win32
- {D794137F-03CC-7930-2629-534566E26E2E}.Debug x64|Win32.Build.0 = Debug x64|Win32
- {D794137F-03CC-7930-2629-534566E26E2E}.Debug x64|x64.ActiveCfg = Template|x64
- {D794137F-03CC-7930-2629-534566E26E2E}.Debug x64|x64.Build.0 = Debug x64|x64
{D794137F-03CC-7930-2629-534566E26E2E}.Debug|Win32.ActiveCfg = Debug|Win32
{D794137F-03CC-7930-2629-534566E26E2E}.Debug|Win32.Build.0 = Debug|Win32
{D794137F-03CC-7930-2629-534566E26E2E}.Debug|x64.ActiveCfg = Debug|x64
@@ -202,10 +150,6 @@ Global
{D794137F-03CC-7930-2629-534566E26E2E}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{D794137F-03CC-7930-2629-534566E26E2E}.Release VS2012|x64.ActiveCfg = Release VS2012|x64
{D794137F-03CC-7930-2629-534566E26E2E}.Release VS2012|x64.Build.0 = Release VS2012|x64
- {D794137F-03CC-7930-2629-534566E26E2E}.Release x64|Win32.ActiveCfg = Release x64|Win32
- {D794137F-03CC-7930-2629-534566E26E2E}.Release x64|Win32.Build.0 = Release x64|Win32
- {D794137F-03CC-7930-2629-534566E26E2E}.Release x64|x64.ActiveCfg = Release x64|x64
- {D794137F-03CC-7930-2629-534566E26E2E}.Release x64|x64.Build.0 = Release x64|x64
{D794137F-03CC-7930-2629-534566E26E2E}.Release|Win32.ActiveCfg = Release|Win32
{D794137F-03CC-7930-2629-534566E26E2E}.Release|Win32.Build.0 = Release|Win32
{D794137F-03CC-7930-2629-534566E26E2E}.Release|x64.ActiveCfg = Release|x64
@@ -214,10 +158,6 @@ Global
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug VS2012|Win32.Build.0 = Debug VS2012|Win32
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug VS2012|x64.ActiveCfg = Debug VS2012|x64
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug VS2012|x64.Build.0 = Debug VS2012|x64
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug x64|Win32.ActiveCfg = Debug x64|Win32
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug x64|Win32.Build.0 = Debug x64|Win32
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug x64|x64.ActiveCfg = Debug x64|x64
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug x64|x64.Build.0 = Debug x64|x64
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug|Win32.ActiveCfg = Debug|Win32
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug|Win32.Build.0 = Debug|Win32
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Debug|x64.ActiveCfg = Debug|x64
@@ -226,10 +166,6 @@ Global
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release VS2012|Win32.Build.0 = Release VS2012|Win32
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release VS2012|x64.ActiveCfg = Release VS2012|x64
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release VS2012|x64.Build.0 = Release VS2012|x64
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release x64|Win32.ActiveCfg = Release x64|Win32
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release x64|Win32.Build.0 = Release x64|Win32
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release x64|x64.ActiveCfg = Release x64|x64
- {E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release x64|x64.Build.0 = Release x64|x64
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release|Win32.ActiveCfg = Release|Win32
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release|Win32.Build.0 = Release|Win32
{E58F13BF-6D5C-D139-8404-2E94F34E11D0}.Release|x64.ActiveCfg = Release|x64
diff --git a/libpng/libpng.vcxproj b/libpng/libpng.vcxproj
index ef6fb28..9d359bc 100644
--- a/libpng/libpng.vcxproj
+++ b/libpng/libpng.vcxproj
@@ -140,61 +140,51 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release SSE2|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release SSE|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE2|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno SSE|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Inferno|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -206,81 +196,68 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug SSE|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE2|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno SSE|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Inferno|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -295,18 +272,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <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">
diff --git a/nGenEx/ActiveWindow.h b/nGenEx/ActiveWindow.h
index c95fb6a..cd7780b 100644
--- a/nGenEx/ActiveWindow.h
+++ b/nGenEx/ActiveWindow.h
@@ -315,10 +315,10 @@ protected:
void Map##cname##fname(ActiveWindow* client, AWEvent* event) \
{ cname* c = (cname*) client; c->fname(event); }
-#define REGISTER_CLIENT(eid, ctrl, cname, fname)\ //-V571
+#define REGISTER_CLIENT(eid, ctrl, cname, fname)\
if (ctrl) ctrl->RegisterClient(eid, this, Map##cname##fname);
-#define UNREGISTER_CLIENT(eid, ctrl, cname)\ //-V571
+#define UNREGISTER_CLIENT(eid, ctrl, cname)\
if (ctrl) ctrl->UnregisterClient(eid, this);
#endif ActiveWindow_h
diff --git a/nGenEx/D3DXImage.cpp b/nGenEx/D3DXImage.cpp
index a10eac3..c83c2c4 100644
--- a/nGenEx/D3DXImage.cpp
+++ b/nGenEx/D3DXImage.cpp
@@ -12,8 +12,7 @@
D3DX image file loader
*/
-#include <string>
-#include "afxdlgs.h"
+
#include "MemDebug.h"
#include "D3DXImage.h"
#include "VideoDX9.h"
@@ -54,14 +53,8 @@ bool D3DXImage::Load(char *filename)
FILE* f;
fopen_s(&f, filename,"rb");
- if (f == NULL) {
- std::string errstring = "Magic was unable to locate the following texture: ";
- errstring += filename;
- errstring += "\nPlease locate the texture, and copy it to the same directory the Magic executable is in.";
-
- MessageBox(NULL, errstring.c_str(), "Help!", MB_ICONWARNING | MB_OK);
- return success;
- }
+ if (f == NULL)
+ return success;
int len = 0;
BYTE* buf = 0;
diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj
index 6aa59cb..81907cd 100644
--- a/nGenEx/nGenEx.vcxproj
+++ b/nGenEx/nGenEx.vcxproj
@@ -67,11 +67,9 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -83,31 +81,28 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -125,19 +120,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</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">
diff --git a/zlib/Zlib.vcxproj b/zlib/Zlib.vcxproj
index fabb9f9..e1d1433 100644
--- a/zlib/Zlib.vcxproj
+++ b/zlib/Zlib.vcxproj
@@ -67,11 +67,9 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -83,31 +81,28 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -125,19 +120,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</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">