From: <geo...@us...> - 2007-07-21 21:40:34
|
Revision: 2194 http://svn.sourceforge.net/freeorion/revision/?rev=2194&view=rev Author: geoffthemedio Date: 2007-07-21 14:40:36 -0700 (Sat, 21 Jul 2007) Log Message: ----------- -Updated MSVC project files -Fixed typo in credits.xml Modified Paths: -------------- trunk/FreeOrion/default/credits.xml trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj Modified: trunk/FreeOrion/default/credits.xml =================================================================== --- trunk/FreeOrion/default/credits.xml 2007-07-21 18:53:06 UTC (rev 2193) +++ trunk/FreeOrion/default/credits.xml 2007-07-21 21:40:36 UTC (rev 2194) @@ -18,7 +18,7 @@ <PERSON name="Michael J. Agostini" nick="" task="Programming"/> <PERSON name="Karol Szumski" nick="MareviQ" task="Programming"/> <PERSON name="Mike Dotterer" nick="maelstrom512" task="Programming"/> - <PERSON name="qk-gen" nick="" tack="Programming"/> + <PERSON name="qk-gen" nick="" task="Programming"/> </GROUP> <GROUP name ="GAMEDESIGN"> <PERSON name="Samuel Knowlton" nick="Aquitaine" task="Game Design"/> Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj 2007-07-21 18:53:06 UTC (rev 2193) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj 2007-07-21 21:40:36 UTC (rev 2194) @@ -42,8 +42,8 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_34";C:\Python25\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_34";C:\Python25\include;../../../network/" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK" RuntimeLibrary="2" DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" @@ -52,7 +52,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" - DisableSpecificWarnings="4099;4251;4800;4267;4275;4244;4101;4258;4996" + DisableSpecificWarnings="4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311" ShowIncludes="false" /> <Tool @@ -66,7 +66,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="GiGiNet.lib GiGiSDL.lib GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib SDLmain.lib log4cpp.lib freetype214MT.lib cdt.lib circogen.lib common.lib dotgen.lib fdpgen.lib gd.lib graph.lib gvc.lib libexpat.lib neatogen.lib pack.lib pathplan.lib plugin.lib twopigen.lib png.lib jpeg.lib OpenAL32.lib alut.lib libvorbisfile.lib" + AdditionalDependencies="GiGiSDL.lib GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib SDLmain.lib log4cpp.lib freetype214MT.lib cdt.lib circogen.lib common.lib dotgen.lib fdpgen.lib gd.lib graph.lib gvc.lib libexpat.lib neatogen.lib pack.lib pathplan.lib plugin.lib twopigen.lib png.lib jpeg.lib OpenAL32.lib alut.lib libvorbisfile.lib" OutputFile="../../../freeorion.exe" LinkIncremental="1" AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/;C:\Python25\libs" @@ -125,6 +125,14 @@ RelativePath="..\..\..\client\ClientApp.h" > </File> + <File + RelativePath="..\..\..\client\ClientFSMEvents.cpp" + > + </File> + <File + RelativePath="..\..\..\client\ClientFSMEvents.h" + > + </File> <Filter Name="human" > @@ -148,6 +156,14 @@ RelativePath="..\..\..\client\human\HumanClientAppSoundOpenAL.h" > </File> + <File + RelativePath="..\..\..\client\human\HumanClientFSM.cpp" + > + </File> + <File + RelativePath="..\..\..\client\human\HumanClientFSM.h" + > + </File> </Filter> </Filter> <Filter @@ -329,11 +345,11 @@ Name="network" > <File - RelativePath="..\..\..\network\ClientNetworkCore.cpp" + RelativePath="..\..\..\network\ClientNetworking.cpp" > </File> <File - RelativePath="..\..\..\network\ClientNetworkCore.h" + RelativePath="..\..\..\network\ClientNetworking.h" > </File> <File @@ -345,13 +361,29 @@ > </File> <File - RelativePath="..\..\..\network\NetworkCore.cpp" + RelativePath="..\..\..\network\MessageQueue.cpp" > </File> <File - RelativePath="..\..\..\network\NetworkCore.h" + RelativePath="..\..\..\network\MessageQueue.h" > </File> + <File + RelativePath="..\..\..\network\Networking.cpp" + > + </File> + <File + RelativePath="..\..\..\network\Networking.h" + > + </File> + <Filter + Name="boost" + > + <File + RelativePath="..\..\..\network\boost\error_code.cpp" + > + </File> + </Filter> </Filter> <Filter Name="UI" @@ -561,14 +593,6 @@ > </File> <File - RelativePath="..\..\..\Ui\Splash.cpp" - > - </File> - <File - RelativePath="..\..\..\Ui\Splash.h" - > - </File> - <File RelativePath="..\..\..\Ui\StringTable.cpp" > </File> Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj 2007-07-21 18:53:06 UTC (rev 2193) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj 2007-07-21 21:40:36 UTC (rev 2194) @@ -39,8 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_34";C:\Python25\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_AI;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_34";C:\Python25\include;../../../network/" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_AI;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK" RuntimeLibrary="2" DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" @@ -49,7 +49,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" - DisableSpecificWarnings="4099;4251;4800;4267;4275;4244;4101;4258;4996" + DisableSpecificWarnings="4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311" /> <Tool Name="VCManagedResourceCompilerTool" @@ -62,13 +62,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="GiGiNet.lib GiGiSDL.lib GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib SDLmain.lib log4cpp.lib freetype214MT.lib cdt.lib common.lib dotgen.lib gd.lib graph.lib pathplan.lib libexpat.lib png.lib jpeg.lib python25.lib boost_python-vc80-mt-1_34.lib" + AdditionalDependencies="GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib log4cpp.lib freetype214MT.lib cdt.lib common.lib dotgen.lib gd.lib graph.lib pathplan.lib libexpat.lib png.lib jpeg.lib python25.lib boost_python-vc80-mt-1_34.lib" OutputFile="../../../freeorionca.exe" LinkIncremental="1" AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/;C:\Python25\libs" GenerateManifest="true" GenerateDebugInformation="false" - SubSystem="2" + SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" OptimizeForWindows98="1" @@ -120,6 +120,14 @@ RelativePath="..\..\..\client\ClientApp.h" > </File> + <File + RelativePath="..\..\..\client\ClientFSMEvents.cpp" + > + </File> + <File + RelativePath="..\..\..\client\ClientFSMEvents.h" + > + </File> <Filter Name="AI" > @@ -181,11 +189,11 @@ Name="network" > <File - RelativePath="..\..\..\network\ClientNetworkCore.cpp" + RelativePath="..\..\..\network\ClientNetworking.cpp" > </File> <File - RelativePath="..\..\..\network\ClientNetworkCore.h" + RelativePath="..\..\..\network\ClientNetworking.h" > </File> <File @@ -197,13 +205,29 @@ > </File> <File - RelativePath="..\..\..\network\NetworkCore.cpp" + RelativePath="..\..\..\network\MessageQueue.cpp" > </File> <File - RelativePath="..\..\..\network\NetworkCore.h" + RelativePath="..\..\..\network\MessageQueue.h" > </File> + <File + RelativePath="..\..\..\network\Networking.cpp" + > + </File> + <File + RelativePath="..\..\..\network\Networking.h" + > + </File> + <Filter + Name="boost" + > + <File + RelativePath="..\..\..\network\boost\error_code.cpp" + > + </File> + </Filter> </Filter> <Filter Name="universe" Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj 2007-07-21 18:53:06 UTC (rev 2193) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj 2007-07-21 21:40:36 UTC (rev 2194) @@ -40,8 +40,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_34";C:\Python25\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="../../../../include/;"../../../../Boost/include/boost-1_34";C:\Python25\include;../../../network/" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;BOOST_SIGNALS_STATIC_LINK" RuntimeLibrary="2" DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" @@ -50,7 +50,7 @@ WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" - DisableSpecificWarnings="4099;4251;4800;4267;4275;4244;4101;4258;4996" + DisableSpecificWarnings="4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311" /> <Tool Name="VCManagedResourceCompilerTool" @@ -63,13 +63,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="GiGiNet.lib GiGiSDL.lib GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib SDLmain.lib log4cpp.lib freetype214MT.lib cdt.lib common.lib dotgen.lib gd.lib graph.lib pathplan.lib libexpat.lib png.lib jpeg.lib" + AdditionalDependencies="GiGi.lib opengl32.lib glu32.lib wsock32.lib zdll.lib SDL.lib log4cpp.lib freetype214MT.lib cdt.lib common.lib dotgen.lib gd.lib graph.lib pathplan.lib libexpat.lib png.lib jpeg.lib" OutputFile="../../../freeoriond.exe" LinkIncremental="1" AdditionalLibraryDirectories="../../../../lib/;../../../../Boost/lib/;C:\Python25\libs" GenerateManifest="true" GenerateDebugInformation="true" - SubSystem="2" + SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" OptimizeForWindows98="1" @@ -170,21 +170,37 @@ > </File> <File - RelativePath="..\..\..\network\NetworkCore.cpp" + RelativePath="..\..\..\network\MessageQueue.cpp" > </File> <File - RelativePath="..\..\..\network\NetworkCore.h" + RelativePath="..\..\..\network\MessageQueue.h" > </File> <File - RelativePath="..\..\..\network\ServerNetworkCore.cpp" + RelativePath="..\..\..\network\Networking.cpp" > </File> <File - RelativePath="..\..\..\network\ServerNetworkCore.h" + RelativePath="..\..\..\network\Networking.h" > </File> + <File + RelativePath="..\..\..\network\ServerNetworking.cpp" + > + </File> + <File + RelativePath="..\..\..\network\ServerNetworking.h" + > + </File> + <Filter + Name="boost" + > + <File + RelativePath="..\..\..\network\boost\error_code.cpp" + > + </File> + </Filter> </Filter> <Filter Name="server" @@ -209,6 +225,14 @@ RelativePath="..\..\..\server\ServerApp.h" > </File> + <File + RelativePath="..\..\..\server\ServerFSM.cpp" + > + </File> + <File + RelativePath="..\..\..\server\ServerFSM.h" + > + </File> </Filter> <Filter Name="universe" |