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. --- Stars45/Main.cpp | 4 +- Stars45/NetBrokerClient.cpp | 2 +- Stars45/Stars.vcxproj | 324 +++++++++++++++++++++++++++++++++++++++++++- Stars45/Starshatter.cpp | 6 - 4 files changed, 325 insertions(+), 11 deletions(-) (limited to 'Stars45') 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"); } } -- cgit v1.1