From 951429a6f83db4e479617c6cd0f3ebfe14e3983b Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Sat, 7 Jan 2012 15:02:50 +0000 Subject: Adding experimental x64 build configs. THESE DO NOT WORK YET. --- Magic2/Magic.vcxproj | 248 ++++++++++++ NetEx/NetEx.vcxproj | 203 ++++++++++ Opcode/Opcode.vcxproj | 423 +++++++++++++++++++ Stars45/Main.cpp | 4 +- Stars45/NetBrokerClient.cpp | 2 +- Stars45/Stars.vcxproj | 324 ++++++++++++++- Stars45/Starshatter.cpp | 6 - libpng/libpng.vcxproj | 967 +++++++++++++++++++++++++++++++++++++++----- nGenEx/VideoDX9.cpp | 123 ++---- nGenEx/nGenEx.vcxproj | 214 ++++++++++ zlib/Zlib.vcxproj | 199 +++++++++ 11 files changed, 2519 insertions(+), 194 deletions(-) diff --git a/Magic2/Magic.vcxproj b/Magic2/Magic.vcxproj index 110b1cd..7d13d8a 100644 --- a/Magic2/Magic.vcxproj +++ b/Magic2/Magic.vcxproj @@ -1,14 +1,38 @@  + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug Win32 + + Debug + x64 + + + Release x64 + Win32 + + + Release x64 + x64 + Release Win32 + + Release + x64 + @@ -21,11 +45,31 @@ Dynamic MultiByte + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + Application Dynamic MultiByte + + Application + Dynamic + MultiByte + @@ -33,10 +77,26 @@ + + + + + + + + + + + + + + + + .\Debug\ @@ -44,12 +104,36 @@ true ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + .\Debug\ + .\Debug\ + true + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + .\Release\ .\Release\ true $(DXSDK_DIR)\include;$(IncludePath) + + .\Release\ + .\Release\ + true + $(DXSDK_DIR)\include;$(IncludePath) + + + .\Release\ + .\Release\ + true + $(DXSDK_DIR)\include;$(IncludePath) + + + .\Release\ + .\Release\ + true + $(DXSDK_DIR)\include;$(IncludePath) + MultiThreadedDebugDLL @@ -93,6 +177,47 @@ ..\Opcode\OpcodeLib\Debug\OpcodeLib.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.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) + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + ProgramDatabase + ../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\Magic.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + true + _DEBUG;%(PreprocessorDefinitions) + .\Debug\Magic.tlb + true + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\Magic.bsc + + + true + true + Windows + LIBCMT;LIBCD;%(IgnoreSpecificDefaultLibraries) + .\Debug\Magic.exe + ..\Opcode\OpcodeLib\Debug\OpcodeLib.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.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) + + MultiThreadedDLL @@ -132,6 +257,121 @@ ..\Opcode\OpcodeLib\Release\OpcodeLib.lib;..\ngenex\release\ngenex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.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) + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../pnglib;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions) + .\Release\ + .\Release\Magic.pch + .\Release\ + .\Release\ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Magic.tlb + true + Win32 + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Magic.bsc + + + true + Windows + LIBC;%(IgnoreSpecificDefaultLibraries) + .\Release\Magic.exe + ..\Opcode\OpcodeLib\Release\OpcodeLib.lib;..\ngenex\release\ngenex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.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) + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../pnglib;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions) + .\Release\ + .\Release\Magic.pch + .\Release\ + .\Release\ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Magic.tlb + true + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Magic.bsc + + + true + Windows + LIBC;%(IgnoreSpecificDefaultLibraries) + .\Release\Magic.exe + ..\Opcode\OpcodeLib\Release\OpcodeLib.lib;..\ngenex\release\ngenex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.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) + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../pnglib;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions) + .\Release\ + .\Release\Magic.pch + .\Release\ + .\Release\ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Magic.tlb + true + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Magic.bsc + + + true + Windows + LIBC;%(IgnoreSpecificDefaultLibraries) + .\Release\Magic.exe + ..\Opcode\OpcodeLib\Release\OpcodeLib.lib;..\ngenex\release\ngenex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.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) + + @@ -217,9 +457,17 @@ Create + Create stdafx.h + stdafx.h Create + Create + Create + Create stdafx.h + stdafx.h + stdafx.h + stdafx.h diff --git a/NetEx/NetEx.vcxproj b/NetEx/NetEx.vcxproj index b5d391d..31d3806 100644 --- a/NetEx/NetEx.vcxproj +++ b/NetEx/NetEx.vcxproj @@ -1,18 +1,46 @@  + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug Win32 + + Debug + x64 + + + Release x64 + Win32 + + + Release x64 + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + @@ -22,39 +50,97 @@ Application + + Application + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + + .\Debug\ .\Debug\ + + .\Debug\ + .\Debug\ + .\Release\ .\Release\ + + .\Release\ + .\Release\ + + + .\Release\ + .\Release\ + + + .\Release\ + .\Release\ + MultiThreadedDebug @@ -86,6 +172,36 @@ .\Debug\NetEx.lib + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + ProgramDatabase + ../FoundationEx;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) + .\Debug\ + .\Debug\NetEx.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\NetEx.bsc + + + true + .\Debug\NetEx.lib + + MultiThreaded @@ -115,6 +231,93 @@ .\Release\NetEx.lib + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../FoundationEx;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) + .\Release\ + .\Release\NetEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\NetEx.bsc + + + true + .\Release\NetEx.lib + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../FoundationEx;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) + .\Release\ + .\Release\NetEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\NetEx.bsc + + + true + .\Release\NetEx.lib + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ../FoundationEx;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) + .\Release\ + .\Release\NetEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\NetEx.bsc + + + true + .\Release\NetEx.lib + + diff --git a/Opcode/Opcode.vcxproj b/Opcode/Opcode.vcxproj index 8574bc4..91b896a 100644 --- a/Opcode/Opcode.vcxproj +++ b/Opcode/Opcode.vcxproj @@ -1,18 +1,46 @@  + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug Win32 + + Debug + x64 + + + Release x64 + Win32 + + + Release x64 + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + @@ -22,30 +50,72 @@ Application + + Application + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + + .\Debug\ @@ -53,11 +123,32 @@ false ..\Opcode;$(IncludePath) + + .\Debug\ + .\Debug\ + false + ..\Opcode;$(IncludePath) + .\Release\ .\Release\ false + + .\Release\ + .\Release\ + false + + + .\Release\ + .\Release\ + false + + + .\Release\ + .\Release\ + false + MultiThreadedDebug @@ -103,6 +194,49 @@ .\Debug\Opcode_D.lib + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + WIN32;_DEBUG;_WINDOWS;_USRDLL;OPCODE_EXPORTS;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\Opcode.pch + Use + stdafx.h + .\Debug\ + .\Debug\ + + + EnableFastChecks + + + true + _DEBUG;%(PreprocessorDefinitions) + .\Debug\Opcode.tlb + true + + + 0x040c + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\Opcode.bsc + + + true + true + true + Console + Debug\Opcode_D.dll + .\Debug\Opcode_D.lib + + MultiThreadedDLL @@ -146,164 +280,453 @@ .\Release\Opcode.lib + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;NDEBUG;_WINDOWS;_USRDLL;OPCODE_EXPORTS;%(PreprocessorDefinitions) + .\Release\ + .\Release\Opcode.pch + Use + stdafx.h + .\Release\ + .\Release\ + + + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Opcode.tlb + true + Win32 + + + 0x040c + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Opcode.bsc + + + true + true + false + Console + .\Release\Opcode.dll + .\Release\Opcode.lib + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;NDEBUG;_WINDOWS;_USRDLL;OPCODE_EXPORTS;%(PreprocessorDefinitions) + .\Release\ + .\Release\Opcode.pch + Use + stdafx.h + .\Release\ + .\Release\ + + + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Opcode.tlb + true + + + 0x040c + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Opcode.bsc + + + true + true + false + Console + .\Release\Opcode.dll + .\Release\Opcode.lib + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;NDEBUG;_WINDOWS;_USRDLL;OPCODE_EXPORTS;%(PreprocessorDefinitions) + .\Release\ + .\Release\Opcode.pch + Use + stdafx.h + .\Release\ + .\Release\ + + + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Opcode.tlb + true + + + 0x040c + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Opcode.bsc + + + true + true + false + Console + .\Release\Opcode.dll + .\Release\Opcode.lib + + + + + + + + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist Create + Create stdafx.h + stdafx.h /QIfist /QIfist + /QIfist /QIfist Create + Create + Create + Create stdafx.h + stdafx.h + stdafx.h + stdafx.h /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist + /QIfist /QIfist diff --git a/Stars45/Main.cpp b/Stars45/Main.cpp index f2ba122..e7fc64a 100644 --- a/Stars45/Main.cpp +++ b/Stars45/Main.cpp @@ -64,9 +64,9 @@ LPSTR lpCmdLine, int nCmdShow) int do_server = 0; if (strstr(lpCmdLine, "-server")) - ErrLog = fopen("serverlog.txt", "w"); + ErrLog = fopen("serverlog.txt", "w"); else - ErrLog = fopen("errlog.txt", "w"); + ErrLog = fopen("errlog.txt", "w"); PrintLogHeader(); diff --git a/Stars45/NetBrokerClient.cpp b/Stars45/NetBrokerClient.cpp index 7783172..df913e8 100644 --- a/Stars45/NetBrokerClient.cpp +++ b/Stars45/NetBrokerClient.cpp @@ -26,7 +26,7 @@ extern const char* versionInfo; const char* HOSTNAME = "www.starshatter.com"; const WORD HTTPPORT = 80; -bool NetBrokerClient::broker_available = true; +bool NetBrokerClient::broker_available = false; bool NetBrokerClient::broker_found = false; // +--------------------------------------------------------------------+ diff --git a/Stars45/Stars.vcxproj b/Stars45/Stars.vcxproj index f54e43e..a4a6afa 100644 --- a/Stars45/Stars.vcxproj +++ b/Stars45/Stars.vcxproj @@ -1,18 +1,46 @@  + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug Win32 + + Debug + x64 + + + Release x64 + Win32 + + + Release x64 + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + @@ -22,10 +50,32 @@ Application + + Application + Application false MultiByte + true + + + Application + false + MultiByte + true + + + Application + false + MultiByte + true + + + Application + false + MultiByte + true Application @@ -33,20 +83,45 @@ MultiByte Static + + Application + false + MultiByte + Static + + + + + + + + + + + + + + + + + + + + $(SolutionDir)\$(Configuration)\ @@ -55,6 +130,13 @@ $(DXSDK_DIR)\include;$(IncludePath) Starshatter_D + + $(SolutionDir)\$(Configuration)\ + $(SolutionDir)\$(Configuration)\ + true + $(DXSDK_DIR)\include;$(IncludePath) + Starshatter_D + $(SolutionDir)\$(Configuration)\ $(SolutionDir)\$(Configuration)\ @@ -62,11 +144,37 @@ $(DXSDK_DIR)\include;$(IncludePath) Starshatter + + $(SolutionDir)\$(Configuration)\ + $(SolutionDir)\$(Configuration)\ + false + $(DXSDK_DIR)\include;$(IncludePath) + Starshatter + + + $(SolutionDir)\$(Configuration)\ + $(SolutionDir)\$(Configuration)\ + false + $(DXSDK_DIR)\include;$(IncludePath) + Starshatter + + + $(SolutionDir)\$(Configuration)\ + $(SolutionDir)\$(Configuration)\ + false + $(DXSDK_DIR)\include;$(IncludePath) + Starshatter + $(DXSDK_DIR)\include;$(IncludePath) $(SolutionDir)\$(Configuration)\ $(SolutionDir)\$(Configuration)\ + + $(DXSDK_DIR)\include;$(IncludePath) + $(SolutionDir)\$(Configuration)\ + $(SolutionDir)\$(Configuration)\ + MultiThreadedDebug @@ -85,7 +193,7 @@ .\Debug\ .\Debug\ EnableFastChecks - true + false true @@ -117,13 +225,61 @@ $(STARSHATTERPATH)\$(TargetFileName);%(Outputs) + + + MultiThreadedDebug + Default + true + Disabled + true + Level3 + ProgramDatabase + ../FoundationEx;../nGenEx;../NetEx;../Parser;../Opcode/OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\Stars.pch + .\Debug\ + .\Debug\ + EnableFastChecks + false + + + true + _DEBUG;%(PreprocessorDefinitions) + .\Debug\Stars.tlb + true + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\Stars.bsc + + + true + true + Windows + $(SolutionDir)$(Configuration)\$(SolutionName)_D.exe + ..\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) + $(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories) + libcmt.lib + + + copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)" + Copying build... + $(STARSHATTERPATH)\$(TargetFileName);%(Outputs) + + MultiThreaded OnlyExplicitInline true true - MaxSpeed + Full true Level3 ../FoundationEx;../nGenEx;../NetEx;../Parser;../Opcode/OpcodeLib;%(AdditionalIncludeDirectories) @@ -132,6 +288,10 @@ .\Release\Stars.pch .\Release\ .\Release\ + true + Speed + true + StreamingSIMDExtensions2 true @@ -155,6 +315,155 @@ $(SolutionDir)$(Configuration)\$(SolutionName).exe ..\Opcode\Release\Opcode.lib;..\ngenex\release\ngenex.lib;..\netex\release\netex.lib;..\zlib\release\zlib.lib;..\libpng\release\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) $(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories) + UseLinkTimeCodeGeneration + + + copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)" + Copying build... + $(STARSHATTERPATH)\$(TargetFileName);%(Outputs) + + + + + MultiThreaded + OnlyExplicitInline + true + true + Full + true + Level3 + ../FoundationEx;../nGenEx;../NetEx;../Parser;../Opcode/OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + .\Release\ + .\Release\Stars.pch + .\Release\ + .\Release\ + true + Speed + true + StreamingSIMDExtensions2 + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Stars.tlb + true + Win32 + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Stars.bsc + + + true + true + Windows + $(SolutionDir)$(Configuration)\$(SolutionName).exe + ..\Opcode\Release\Opcode.lib;..\ngenex\release\ngenex.lib;..\netex\release\netex.lib;..\zlib\release\zlib.lib;..\libpng\release\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) + $(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories) + UseLinkTimeCodeGeneration + + + copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)" + Copying build... + $(STARSHATTERPATH)\$(TargetFileName);%(Outputs) + + + + + MultiThreaded + OnlyExplicitInline + true + true + Full + true + Level3 + ../FoundationEx;../nGenEx;../NetEx;../Parser;../Opcode/OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + .\Release\ + .\Release\Stars.pch + .\Release\ + .\Release\ + true + Speed + true + StreamingSIMDExtensions2 + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Stars.tlb + true + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Stars.bsc + + + true + true + Windows + $(SolutionDir)$(Configuration)\$(SolutionName).exe + ..\Opcode\Release\Opcode.lib;..\ngenex\release\ngenex.lib;..\netex\release\netex.lib;..\zlib\release\zlib.lib;..\libpng\release\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) + $(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories) + UseLinkTimeCodeGeneration + + + copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)" + Copying build... + $(STARSHATTERPATH)\$(TargetFileName);%(Outputs) + + + + + MultiThreaded + OnlyExplicitInline + true + true + Full + true + Level3 + ../FoundationEx;../nGenEx;../NetEx;../Parser;../Opcode/OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + .\Release\ + .\Release\Stars.pch + .\Release\ + .\Release\ + true + Speed + true + StreamingSIMDExtensions2 + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\Stars.tlb + true + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Stars.bsc + + + true + true + Windows + $(SolutionDir)$(Configuration)\$(SolutionName).exe + ..\Opcode\Release\Opcode.lib;..\ngenex\release\ngenex.lib;..\netex\release\netex.lib;..\zlib\release\zlib.lib;..\libpng\release\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) + $(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;%(AdditionalLibraryDirectories) + UseLinkTimeCodeGeneration copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)" @@ -167,6 +476,11 @@ $(SolutionDir)$(Configuration)\$(SolutionName).exe + + + $(SolutionDir)$(Configuration)\$(SolutionName).exe + + @@ -178,6 +492,9 @@ All + All + All + All @@ -343,6 +660,9 @@ All + All + All + All diff --git a/Stars45/Starshatter.cpp b/Stars45/Starshatter.cpp index 6dc6ef6..fe31a21 100644 --- a/Stars45/Starshatter.cpp +++ b/Stars45/Starshatter.cpp @@ -377,12 +377,6 @@ Starshatter::Init(HINSTANCE hi, HINSTANCE hpi, LPSTR cmdline, int nCmdShow) if (video_settings) { video_settings->is_windowed = true; - /*** - // XXX temporary for video capture - video_settings->window_width = 720; //800; - video_settings->window_height = 386; //431; // 450 - 19 - /***/ - Print(" STARSHATTER RUNNING IN WINDOW MODE\n"); } } diff --git a/libpng/libpng.vcxproj b/libpng/libpng.vcxproj index 4c17fe9..655e975 100644 --- a/libpng/libpng.vcxproj +++ b/libpng/libpng.vcxproj @@ -5,50 +5,114 @@ Debug Inferno SSE2 Win32 + + Debug Inferno SSE2 + x64 + Debug Inferno SSE Win32 + + Debug Inferno SSE + x64 + Debug Inferno Win32 + + Debug Inferno + x64 + Debug SSE2 Win32 + + Debug SSE2 + x64 + Debug SSE Win32 + + Debug SSE + x64 + + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug Win32 + + Debug + x64 + Release Inferno SSE2 Win32 + + Release Inferno SSE2 + x64 + Release Inferno SSE Win32 + + Release Inferno SSE + x64 + Release Inferno Win32 + + Release Inferno + x64 + Release SSE2 Win32 + + Release SSE2 + x64 + Release SSE Win32 + + Release SSE + x64 + + + Release x64 + Win32 + + + Release x64 + x64 + Release Win32 + + Release + x64 + {86C01EAC-2406-40A7-B744-AA858B7607A9} @@ -60,169 +124,359 @@ false true + + StaticLibrary + false + true + StaticLibrary false true + + StaticLibrary + false + true + StaticLibrary false true + + StaticLibrary + false + true + StaticLibrary false true + + StaticLibrary + false + true + StaticLibrary false true + + StaticLibrary + false + true + StaticLibrary false true + + StaticLibrary + false + true + + + StaticLibrary + false + true + + + StaticLibrary + false + true + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 $(ProjectDir)$(Configuration)\ + $(ProjectDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) + ..\zlib;$(IncludePath) @@ -255,12 +509,11 @@ $(IntDir)$(ProjectName).bsc - + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false @@ -271,7 +524,7 @@ $(IntDir) Level3 true - EditAndContinue + ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -286,7 +539,7 @@ $(IntDir)$(ProjectName).bsc - + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) @@ -296,8 +549,6 @@ MultiThreadedDebug false true - StreamingSIMDExtensions - Precise $(OutDir)$(ProjectName).pch $(IntDir) $(IntDir) @@ -319,25 +570,22 @@ $(IntDir)$(ProjectName).bsc - + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false true - StreamingSIMDExtensions2 - Precise $(OutDir)$(ProjectName).pch $(IntDir) $(IntDir) $(IntDir) Level3 true - EditAndContinue + ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -352,7 +600,7 @@ $(IntDir)$(ProjectName).bsc - + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) @@ -385,17 +633,16 @@ $(IntDir)$(ProjectName).bsc - + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false true - StreamingSIMDExtensions2 + StreamingSIMDExtensions Precise $(OutDir)$(ProjectName).pch $(IntDir) @@ -403,7 +650,7 @@ $(IntDir) Level3 true - EditAndContinue + ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -418,38 +665,29 @@ $(IntDir)$(ProjectName).bsc - + - /MP %(AdditionalOptions) - MaxSpeed - AnySuitable - true - Speed - true - true + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded + PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug false - false - Fast + true + StreamingSIMDExtensions2 + Precise $(OutDir)$(ProjectName).pch $(IntDir) $(IntDir) $(IntDir) Level3 true - - - CompileAsC + EditAndContinue - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ..\..;%(AdditionalIncludeDirectories) $(ProjectDir)\$(Configuration)\libpng.lib @@ -460,33 +698,28 @@ $(IntDir)$(ProjectName).bsc - + - /MP %(AdditionalOptions) - MaxSpeed - AnySuitable - true - Speed - true + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - MultiThreaded + PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug false - false - Fast + true + StreamingSIMDExtensions2 + Precise $(OutDir)$(ProjectName).pch $(IntDir) $(IntDir) $(IntDir) Level3 true - CompileAsC + ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ..\..;%(AdditionalIncludeDirectories) $(ProjectDir)\$(Configuration)\libpng.lib @@ -497,20 +730,16 @@ $(IntDir)$(ProjectName).bsc - + - /MP %(AdditionalOptions) - Full - AnySuitable - true - Speed - true + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - MultiThreaded + PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug false - false + true StreamingSIMDExtensions Precise $(OutDir)$(ProjectName).pch @@ -519,12 +748,11 @@ $(IntDir) Level3 true - CompileAsC + EditAndContinue - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ..\..;%(AdditionalIncludeDirectories) $(ProjectDir)\$(Configuration)\libpng.lib @@ -535,21 +763,16 @@ $(IntDir)$(ProjectName).bsc - + - /MP %(AdditionalOptions) - Full - AnySuitable - true - Speed - true + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - MultiThreaded + PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug false - false - StreamingSIMDExtensions2 + true + StreamingSIMDExtensions Precise $(OutDir)$(ProjectName).pch $(IntDir) @@ -557,12 +780,11 @@ $(IntDir) Level3 true - CompileAsC + ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ..\..;%(AdditionalIncludeDirectories) $(ProjectDir)\$(Configuration)\libpng.lib @@ -573,24 +795,17 @@ $(IntDir)$(ProjectName).bsc - + - /MP %(AdditionalOptions) - Full - AnySuitable - true - Speed - true - true + Disabled ..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded + PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug false - false - StreamingSIMDExtensions + true + StreamingSIMDExtensions2 Precise $(OutDir)$(ProjectName).pch $(IntDir) @@ -598,14 +813,523 @@ $(IntDir) Level3 true - - - CompileAsC + EditAndContinue - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + Disabled + ..\..\zlib;%(AdditionalIncludeDirectories) + PNG_DEBUG=1;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + false + true + StreamingSIMDExtensions2 + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + MaxSpeed + AnySuitable + true + Speed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + false + Fast + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + MaxSpeed + AnySuitable + true + Speed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + false + Fast + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + MaxSpeed + AnySuitable + true + Speed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + false + Fast + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + MaxSpeed + AnySuitable + true + Speed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + false + Fast + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + MaxSpeed + AnySuitable + true + Speed + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + Fast + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + MaxSpeed + AnySuitable + true + Speed + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + Fast + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + Full + AnySuitable + true + Speed + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + StreamingSIMDExtensions + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + Full + AnySuitable + true + Speed + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + StreamingSIMDExtensions + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + Full + AnySuitable + true + Speed + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + StreamingSIMDExtensions2 + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + Full + AnySuitable + true + Speed + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + StreamingSIMDExtensions2 + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + Full + AnySuitable + true + Speed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + false + StreamingSIMDExtensions + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + + + + /MP %(AdditionalOptions) + Full + AnySuitable + true + Speed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + false + StreamingSIMDExtensions + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) $(ProjectDir)\$(Configuration)\libpng.lib @@ -659,6 +1383,49 @@ $(IntDir)$(ProjectName).bsc + + + /MP %(AdditionalOptions) + Full + AnySuitable + true + Speed + true + true + ..\..\zlib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + false + false + StreamingSIMDExtensions2 + Precise + $(OutDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ..\..;%(AdditionalIncludeDirectories) + + + $(ProjectDir)\$(Configuration)\libpng.lib + true + + + true + $(IntDir)$(ProjectName).bsc + + diff --git a/nGenEx/VideoDX9.cpp b/nGenEx/VideoDX9.cpp index 821eaf4..c393eed 100644 --- a/nGenEx/VideoDX9.cpp +++ b/nGenEx/VideoDX9.cpp @@ -2233,23 +2233,16 @@ VideoDX9::DrawSegment(Segment* segment) hr = d3ddevice->SetFVF(VideoDX9SolidVertex::FVF); } - bool would_bump = !IsBumpMapEnabled() && - mtl->bump > 0.5; + bool would_bump = !IsBumpMapEnabled() && mtl->bump > 0.5; - bool will_bump = IsBumpMapEnabled() && - surface_has_tangent_data && - shaders_ok && - camera; + bool will_bump = IsBumpMapEnabled() && surface_has_tangent_data && shaders_ok && camera; bool do_pix = will_bump && render_state[LIGHTING_PASS] == 0; bool do_bump = will_bump && render_state[LIGHTING_PASS] > 0; D3DXMATRIX matrixWVP = matrixWorld * matrixView * matrixProj; - D3DXVECTOR4 eyePos( (float) camera->Pos().x, - (float) camera->Pos().y, - (float) camera->Pos().z, - 1.0f); + D3DXVECTOR4 eyePos( (float) camera->Pos().x, (float) camera->Pos().y, (float) camera->Pos().z, 1.0f); D3DXVECTOR4 eyeObj; D3DXVec4Transform(&eyeObj, &eyePos, &matrixWorldInverse); @@ -2268,7 +2261,7 @@ VideoDX9::DrawSegment(Segment* segment) lightPos.z = (float) main_light->Location().z; if (mtl->tex_bumpmap && do_bump) - D3DXVec4Transform(&lightPos, &lightPos, &matrixWorldInverse); + D3DXVec4Transform(&lightPos, &lightPos, &matrixWorldInverse); lightColor.x = main_light->GetColor().fRed() * main_light->Intensity(); lightColor.y = main_light->GetColor().fGreen() * main_light->Intensity(); @@ -2303,12 +2296,12 @@ VideoDX9::DrawSegment(Segment* segment) magic_fx->SetVector("eyeObj", &eyeObj); FLOAT base_bias = (FLOAT) (DW2I(render_state[Z_BIAS]) / -10000.0); - magic_fx->SetFloat("bias", base_bias + video_settings.depth_bias); + magic_fx->SetFloat("bias", base_bias + video_settings.depth_bias); ColorValue orig_ks = mtl->Ks; if (would_bump && mtl->specular_value >= 0.5) - mtl->Ks = mtl->Ks * 0.3; + mtl->Ks = mtl->Ks * 0.3; magic_fx->SetValue("Ka", &mtl->Ka, sizeof(ColorValue)); magic_fx->SetValue("Kd", &mtl->Kd, sizeof(ColorValue)); @@ -2317,29 +2310,26 @@ VideoDX9::DrawSegment(Segment* segment) magic_fx->SetFloat("Ns", mtl->power); if (would_bump && mtl->specular_value >= 0.5) - mtl->Ks = orig_ks; + mtl->Ks = orig_ks; if (mtl->tex_diffuse) { IDirect3DTexture9* texture = texcache->FindTexture(mtl->tex_diffuse); magic_fx->SetTexture("tex_d", texture); - } - else { + } else { magic_fx->SetTexture("tex_d", 0); } if (mtl->tex_emissive) { IDirect3DTexture9* texture = texcache->FindTexture(mtl->tex_emissive); magic_fx->SetTexture("tex_e", texture); - } - else { + } else { magic_fx->SetTexture("tex_e", 0); } if (mtl->tex_specular && IsSpecMapEnabled()) { IDirect3DTexture9* texture = texcache->FindTexture(mtl->tex_specular); magic_fx->SetTexture("tex_s", texture); - } - else { + } else { magic_fx->SetTexture("tex_s", 0); } @@ -2347,13 +2337,10 @@ VideoDX9::DrawSegment(Segment* segment) IDirect3DTexture9* texture = texcache->FindNormalMap(mtl->tex_bumpmap, mtl->bump); magic_fx->SetTexture("tex_n", texture); magic_fx->SetFloat("offsetAmp", mtl->bump / mtl->tex_bumpmap->Height()); - } - - else if (mtl->tex_bumpmap && !do_bump) { + } else if (mtl->tex_bumpmap && !do_bump) { IDirect3DTexture9* texture = texcache->FindTexture(mtl->tex_bumpmap); magic_fx->SetTexture("tex_x", texture); - } - else { + } else { magic_fx->SetTexture("tex_x", 0); } @@ -2362,55 +2349,48 @@ VideoDX9::DrawSegment(Segment* segment) if (mtl_shader) { if (!strcmp(mtl_shader, "null")) - return true; + return true; hnd_shader = magic_fx->GetTechniqueByName(mtl_shader); } if (hnd_shader) { hr = magic_fx->SetTechnique(hnd_shader); - } - else { + } else { if (will_bump) { if (mtl->tex_specular && IsSpecMapEnabled()) { if (mtl->tex_bumpmap && do_bump) { if (ps_version >= D3DPS_VERSION(2,0)) - hr = magic_fx->SetTechnique("BumpSpecMapPix"); + hr = magic_fx->SetTechnique("BumpSpecMapPix"); else - hr = magic_fx->SetTechnique("BumpSpecMap"); - } - else if (mtl->tex_emissive && render_state[LIGHTING_PASS] == 0) { + hr = magic_fx->SetTechnique("BumpSpecMap"); + } else if (mtl->tex_emissive && render_state[LIGHTING_PASS] == 0) { if (ps_version >= D3DPS_VERSION(2,0)) - hr = magic_fx->SetTechnique("EmissiveSpecMapPix"); + hr = magic_fx->SetTechnique("EmissiveSpecMapPix"); else - hr = magic_fx->SetTechnique("EmissiveSpecularTexture"); - } - else { + hr = magic_fx->SetTechnique("EmissiveSpecularTexture"); + } else { if (ps_version >= D3DPS_VERSION(2,0)) hr = magic_fx->SetTechnique("SpecMapPix"); else hr = magic_fx->SetTechnique("SpecularTexture"); } - } - - else { + } else { if (mtl->tex_bumpmap && do_bump) { if (ps_version >= D3DPS_VERSION(2,0)) - hr = magic_fx->SetTechnique("BumpMapPix"); + hr = magic_fx->SetTechnique("BumpMapPix"); else - hr = magic_fx->SetTechnique("BumpMap"); - } - else if (mtl->tex_emissive && render_state[LIGHTING_PASS] == 0) { + hr = magic_fx->SetTechnique("BumpMap"); + } else if (mtl->tex_emissive && render_state[LIGHTING_PASS] == 0) { if (ps_version >= D3DPS_VERSION(2,0)) - hr = magic_fx->SetTechnique("EmissivePix"); + hr = magic_fx->SetTechnique("EmissivePix"); else - hr = magic_fx->SetTechnique("EmissiveTexture"); - } - else { + hr = magic_fx->SetTechnique("EmissiveTexture"); + } else { if (ps_version >= D3DPS_VERSION(2,0)) - hr = magic_fx->SetTechnique("SimplePix"); + hr = magic_fx->SetTechnique("SimplePix"); else - hr = magic_fx->SetTechnique("SimpleTexture"); + hr = magic_fx->SetTechnique("SimpleTexture"); } } } @@ -2419,8 +2399,7 @@ VideoDX9::DrawSegment(Segment* segment) if (mtl->tex_specular && IsSpecMapEnabled()) { if (mtl->tex_emissive && render_state[LIGHTING_PASS] == 0) { hr = magic_fx->SetTechnique("EmissiveSpecularTexture"); - } - else { + } else { hr = magic_fx->SetTechnique("SpecularTexture"); } } @@ -2428,30 +2407,19 @@ VideoDX9::DrawSegment(Segment* segment) else { if (mtl->tex_emissive && render_state[LIGHTING_PASS] == 0) { hr = magic_fx->SetTechnique("EmissiveTexture"); - } - else { + } else { hr = magic_fx->SetTechnique("SimpleTexture"); } } - } - - else { + } else { hr = magic_fx->SetTechnique("SimpleMaterial"); } } if (environment_cube != 0 && magic_fx->IsParameterUsed("env_cube", hnd_shader)) { - /* - D3DXMATRIX matP; - D3DXMatrixInverse(&matP, NULL, &matrixView); - matP._41 = matP._42 = matP._43 = 0.0f; - */ - D3DXMATRIX env_matrix; D3DXMatrixIdentity(&env_matrix); - //D3DXMatrixScaling(&env_matrix, 1.0f, 1.0f, -1.0f); - //D3DXMatrixMultiply(&env_matrix, &matP, &env_matrix); magic_fx->SetMatrix("env_matrix", &env_matrix); magic_fx->SetTexture("env_cube", environment_cube->GetTexture()); } @@ -2460,8 +2428,7 @@ VideoDX9::DrawSegment(Segment* segment) d3ddevice->SetRenderState(D3DRS_STENCILENABLE, TRUE); d3ddevice->SetRenderState(D3DRS_STENCILREF, 0x01); d3ddevice->SetRenderState(D3DRS_STENCILFUNC, D3DCMP_GREATER); - } - else { + } else { d3ddevice->SetRenderState(D3DRS_STENCILENABLE, FALSE); } @@ -2469,8 +2436,7 @@ VideoDX9::DrawSegment(Segment* segment) current_blend_state = 100; SetBlendType(BLEND_ADDITIVE); SetRenderState(Z_WRITE_ENABLE, FALSE); - } - else { + } else { current_blend_state = 100; SetBlendType(mtl->blend); } @@ -2494,9 +2460,7 @@ VideoDX9::DrawSegment(Segment* segment) } hr = magic_fx->End(); - } - - else { + } else { for (int pass = 0; pass < passes; pass++) { SetupPass(pass); @@ -2511,19 +2475,13 @@ VideoDX9::DrawSegment(Segment* segment) if (detail) { hr = d3ddevice->SetVertexShader(NULL); hr = d3ddevice->SetFVF(VideoDX9DetailVertex::FVF); - } - - else if (luminous) { + } else if (luminous) { hr = d3ddevice->SetVertexShader(NULL); hr = d3ddevice->SetFVF(VideoDX9LuminousVertex::FVF); - } - - else if (surface_has_tangent_data && vertex_declaration) { + } else if (surface_has_tangent_data && vertex_declaration) { hr = d3ddevice->SetVertexShader(NULL); hr = d3ddevice->SetVertexDeclaration(vertex_declaration); - } - - else { + } else { hr = d3ddevice->SetVertexShader(NULL); hr = d3ddevice->SetFVF(VideoDX9SolidVertex::FVF); } @@ -2534,9 +2492,8 @@ VideoDX9::DrawSegment(Segment* segment) if (FAILED(hr)) { static int report = 10; if (report-- > 0) - VideoDX9Error("Could not draw solid polys.", hr); - } - else { + VideoDX9Error("Could not draw solid polys.", hr); + } else { stats.nverts += num_verts; stats.npolys += num_tris; result = true; diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj index e22f00d..9a0b68d 100644 --- a/nGenEx/nGenEx.vcxproj +++ b/nGenEx/nGenEx.vcxproj @@ -1,18 +1,46 @@  + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug Win32 + + Debug + x64 + + + Release x64 + Win32 + + + Release x64 + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + @@ -22,44 +50,109 @@ Application + + Application + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + + .\Debug\ .\Debug\ ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + .\Debug\ + .\Debug\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + .\Release\ .\Release\ ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + .\Release\ + .\Release\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + + .\Release\ + .\Release\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + + .\Release\ + .\Release\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + $(DXSDK_DIR)\include;$(IncludePath) + + $(DXSDK_DIR)\include;$(IncludePath) + MultiThreadedDebug @@ -92,6 +185,37 @@ .\Debug\nGenEx.lib + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + ProgramDatabase + ..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\nGenEx.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\nGenEx.bsc + + + true + .\Debug\nGenEx.lib + + MultiThreaded @@ -122,6 +246,96 @@ .\Release\nGenEx.lib + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + true + .\Release\nGenEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\nGenEx.bsc + + + true + .\Release\nGenEx.lib + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + true + .\Release\nGenEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\nGenEx.bsc + + + true + .\Release\nGenEx.lib + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + true + .\Release\nGenEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\nGenEx.bsc + + + true + .\Release\nGenEx.lib + + diff --git a/zlib/Zlib.vcxproj b/zlib/Zlib.vcxproj index a163fa9..b034376 100644 --- a/zlib/Zlib.vcxproj +++ b/zlib/Zlib.vcxproj @@ -1,18 +1,46 @@  + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug Win32 + + Debug + x64 + + + Release x64 + Win32 + + + Release x64 + x64 + Release Win32 + + Release + x64 + Template Win32 + + Template + x64 + @@ -22,39 +50,97 @@ Application + + Application + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + + .\Debug\ .\Debug\ + + .\Debug\ + .\Debug\ + .\Release\ .\Release\ + + .\Release\ + .\Release\ + + + .\Release\ + .\Release\ + + + .\Release\ + .\Release\ + MultiThreadedDebug @@ -85,6 +171,35 @@ .\Debug\Zlib.lib + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + ProgramDatabase + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + .\Debug\ + .\Debug\Zlib.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\Zlib.bsc + + + true + .\Debug\Zlib.lib + + MultiThreaded @@ -113,6 +228,90 @@ .\Release\Zlib.lib + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + .\Release\Zlib.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Zlib.bsc + + + true + .\Release\Zlib.lib + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + .\Release\Zlib.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Zlib.bsc + + + true + .\Release\Zlib.lib + + + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + .\Release\Zlib.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\Zlib.bsc + + + true + .\Release\Zlib.lib + + -- cgit v1.1