[Gcblue-commits] gcb_wx GCblue.sln,1.1,1.2 GCblue.vcproj,1.45,1.46
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx GCblue.sln,1.1,1.2 GCblue.vcproj,1.45,1.46
|
From: <ddc...@us...> - 2004-03-06 21:07:38
|
Update of /cvsroot/gcblue/gcb_wx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9771 Modified Files: GCblue.sln GCblue.vcproj Log Message: Index: GCblue.sln =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/GCblue.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GCblue.sln 27 Sep 2003 23:22:24 -0000 1.1 --- GCblue.sln 6 Mar 2004 20:52:28 -0000 1.2 *************** *** 1,11 **** ! Microsoft Visual Studio Solution File, Format Version 7.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GCblue", "GCblue.vcproj", "{76C3883D-96DD-4A32-91C5-2ADA4CA505E7}" EndProject Global GlobalSection(SolutionConfiguration) = preSolution ! ConfigName.0 = Debug ! ConfigName.1 = Release ! EndGlobalSection ! GlobalSection(ProjectDependencies) = postSolution EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution --- 1,11 ---- ! Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GCblue", "GCblue.vcproj", "{76C3883D-96DD-4A32-91C5-2ADA4CA505E7}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution ! Debug = Debug ! Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution Index: GCblue.vcproj =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/GCblue.vcproj,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** GCblue.vcproj 2 Mar 2004 02:52:13 -0000 1.45 --- GCblue.vcproj 6 Mar 2004 20:52:28 -0000 1.46 *************** *** 1,6 **** ! <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.00" Name="GCblue" ProjectGUID="{76C3883D-96DD-4A32-91C5-2ADA4CA505E7}" --- 1,6 ---- ! <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.10" Name="GCblue" ProjectGUID="{76C3883D-96DD-4A32-91C5-2ADA4CA505E7}" *************** *** 23,27 **** Optimization="0" AdditionalIncludeDirectories="include/sim;include/graphics;include/common;include/scriptinterface;include;"C:\wxWindows-2.4.1\lib\mswd";include\database" ! PreprocessorDefinitions="WIN32;_DEBUG;BOOST_DEBUG_PYTHON;_WINDOWS;__WINDOWS__;__WXMSW__;__WXDEBUG__;WXDEBUG=1;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;_WIN32_IMPLEMENTATION" MinimalRebuild="FALSE" BasicRuntimeChecks="3" --- 23,27 ---- Optimization="0" AdditionalIncludeDirectories="include/sim;include/graphics;include/common;include/scriptinterface;include;"C:\wxWindows-2.4.1\lib\mswd";include\database" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;__WXDEBUG__;WXDEBUG=1;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;_WIN32_IMPLEMENTATION" MinimalRebuild="FALSE" BasicRuntimeChecks="3" *************** *** 39,48 **** Name="VCLinkerTool" IgnoreImportLibrary="FALSE" ! AdditionalDependencies="python23_d.lib boost_python_debug.lib winmm.lib opengl32.lib glu32.lib Gdiplus.lib GLaux.lib OpenAL32d.lib ALutd.lib comctl32.lib rpcrt4.lib wsock32.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib osgd.lib osgDBd.lib osgTextd.lib osgUtild.lib DemeterDebug.lib DemeterOSGDebug.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib libxml2.lib" ShowProgress="0" OutputFile="$(ProjectDir)/bin/GCblueD.exe" LinkIncremental="2" AdditionalLibraryDirectories="" ! IgnoreDefaultLibraryNames="libcd.lib;libcid.lib;msvcrt.lib;python23.lib" DelayLoadDLLs="" GenerateDebugInformation="TRUE" --- 39,48 ---- Name="VCLinkerTool" IgnoreImportLibrary="FALSE" ! AdditionalDependencies="python23.lib boost_python_debug.lib winmm.lib opengl32.lib glu32.lib Gdiplus.lib GLaux.lib OpenAL32d.lib ALutd.lib comctl32.lib rpcrt4.lib wsock32.lib wxmswd.lib zlibd.lib pngd.lib jpegd.lib tiffd.lib osgd.lib osgDBd.lib osgTextd.lib osgUtild.lib DemeterDebug.lib DemeterOSGDebug.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib libxml2.lib" ShowProgress="0" OutputFile="$(ProjectDir)/bin/GCblueD.exe" LinkIncremental="2" AdditionalLibraryDirectories="" ! IgnoreDefaultLibraryNames="libcd.lib;libcid.lib;msvcrt.lib" DelayLoadDLLs="" GenerateDebugInformation="TRUE" *************** *** 65,69 **** --- 65,75 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration *************** *** 124,130 **** --- 130,144 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <References> + </References> <Files> <Filter *************** *** 193,199 **** Filter=""> <File - RelativePath="src\graphics\ObjectUpdater.cpp"> - </File> - <File RelativePath="src\graphics\cspColorspace.cpp"> </File> --- 207,210 ---- *************** *** 211,214 **** --- 222,228 ---- </File> <File + RelativePath="src\graphics\ObjectUpdater.cpp"> + </File> + <File RelativePath="src\graphics\tc2DGraphicsSurface.cpp"> </File> *************** *** 297,303 **** </File> <File - RelativePath="src\sim\tcAIData.cpp"> - </File> - <File RelativePath="src\sim\tcAero.cpp"> </File> --- 311,314 ---- *************** *** 306,309 **** --- 317,323 ---- </File> <File + RelativePath="src\sim\tcAIData.cpp"> + </File> + <File RelativePath="src\sim\tcAirObject.cpp"> </File> *************** *** 324,330 **** </File> <File - RelativePath="src\sim\tcESMSensor.cpp"> - </File> - <File RelativePath="src\sim\tcEditControl.cpp"> </File> --- 338,341 ---- *************** *** 333,340 **** </File> <File ! RelativePath="src\sim\tcFlightPort.cpp"> </File> <File ! RelativePath="src\sim\tcGameObjIterator.cpp"> </File> <File --- 344,351 ---- </File> <File ! RelativePath="src\sim\tcESMSensor.cpp"> </File> <File ! RelativePath="src\sim\tcFlightPort.cpp"> </File> <File *************** *** 342,345 **** --- 353,359 ---- </File> <File + RelativePath="src\sim\tcGameObjIterator.cpp"> + </File> + <File RelativePath="src\sim\tcGameView.cpp"> </File> *************** *** 357,364 **** </File> <File ! RelativePath="src\sim\tcLaunchRequest.cpp"> </File> <File ! RelativePath="src\sim\tcLauncherState.cpp"> </File> <File --- 371,378 ---- </File> <File ! RelativePath="src\sim\tcLauncherState.cpp"> </File> <File ! RelativePath="src\sim\tcLaunchRequest.cpp"> </File> <File *************** *** 378,385 **** </File> <File ! RelativePath="src\sim\tcOOBView.cpp"> </File> <File ! RelativePath="src\sim\tcObjectControl.cpp"> </File> <File --- 392,399 ---- </File> <File ! RelativePath="src\sim\tcObjectControl.cpp"> </File> <File ! RelativePath="src\sim\tcOOBView.cpp"> </File> <File *************** *** 436,442 **** </File> <File - RelativePath="src\database\tcDBString.cpp"> - </File> - <File RelativePath="src\database\tcDatabase.cpp"> </File> --- 450,453 ---- *************** *** 445,448 **** --- 456,462 ---- </File> <File + RelativePath="src\database\tcDBString.cpp"> + </File> + <File RelativePath="src\database\tcESMDBObject.cpp"> </File> *************** *** 499,505 **** </File> <File - RelativePath="include\common\Resource.h"> - </File> - <File RelativePath="include\common\cspDate.h"> </File> --- 513,516 ---- *************** *** 514,517 **** --- 525,531 ---- </File> <File + RelativePath="include\common\Resource.h"> + </File> + <File RelativePath="include\common\simmath.h"> </File> *************** *** 554,560 **** Filter=""> <File - RelativePath="include\graphics\ObjectUpdater.h"> - </File> - <File RelativePath="include\graphics\cspColorspace.h"> </File> --- 568,571 ---- *************** *** 566,569 **** --- 577,583 ---- </File> <File + RelativePath="include\graphics\ObjectUpdater.h"> + </File> + <File RelativePath="include\graphics\tc2DGraphicsSurface.h"> </File> *************** *** 637,644 **** Filter=""> <File ! RelativePath="include\sim\Game.h"> </File> <File ! RelativePath="include\sim\commandlist.h"> </File> <File --- 651,658 ---- Filter=""> <File ! RelativePath="include\sim\commandlist.h"> </File> <File ! RelativePath="include\sim\Game.h"> </File> <File *************** *** 652,658 **** </File> <File - RelativePath="include\sim\tcAIData.h"> - </File> - <File RelativePath="include\sim\tcAero.h"> </File> --- 666,669 ---- *************** *** 661,664 **** --- 672,678 ---- </File> <File + RelativePath="include\sim\tcAIData.h"> + </File> + <File RelativePath="include\sim\tcAirObject.h"> </File> *************** *** 679,685 **** </File> <File - RelativePath="include\sim\tcESMSensor.h"> - </File> - <File RelativePath="include\sim\tcEditControl.h"> </File> --- 693,696 ---- *************** *** 688,695 **** </File> <File ! RelativePath="include\sim\tcFlightPort.h"> </File> <File ! RelativePath="include\sim\tcGameObjIterator.h"> </File> <File --- 699,706 ---- </File> <File ! RelativePath="include\sim\tcESMSensor.h"> </File> <File ! RelativePath="include\sim\tcFlightPort.h"> </File> <File *************** *** 697,700 **** --- 708,714 ---- </File> <File + RelativePath="include\sim\tcGameObjIterator.h"> + </File> + <File RelativePath="include\sim\tcGameView.h"> </File> *************** *** 712,719 **** </File> <File ! RelativePath="include\sim\tcLaunchRequest.h"> </File> <File ! RelativePath="include\sim\tcLauncherState.h"> </File> <File --- 726,733 ---- </File> <File ! RelativePath="include\sim\tcLauncherState.h"> </File> <File ! RelativePath="include\sim\tcLaunchRequest.h"> </File> <File *************** *** 733,740 **** </File> <File ! RelativePath="include\sim\tcOOBView.h"> </File> <File ! RelativePath="include\sim\tcObjectControl.h"> </File> <File --- 747,754 ---- </File> <File ! RelativePath="include\sim\tcObjectControl.h"> </File> <File ! RelativePath="include\sim\tcOOBView.h"> </File> <File *************** *** 797,810 **** </File> <File ! RelativePath="include\database\tcDBObjSerializer.h"> </File> <File ! RelativePath="include\database\tcDBString.h"> </File> <File ! RelativePath="include\database\tcDatabase.h"> </File> <File ! RelativePath="include\database\tcDatabaseObject.h"> </File> <File --- 811,824 ---- </File> <File ! RelativePath="include\database\tcDatabase.h"> </File> <File ! RelativePath="include\database\tcDatabaseObject.h"> </File> <File ! RelativePath="include\database\tcDBObjSerializer.h"> </File> <File ! RelativePath="include\database\tcDBString.h"> </File> <File *************** *** 854,866 **** Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> <File - RelativePath="res\Default.wav"> - </File> - <File - RelativePath="res\GCblue.ico"> - </File> - <File - RelativePath="res\GCblue.rc"> - </File> - <File RelativePath="res\wx\msw\blank.cur"> </File> --- 868,871 ---- *************** *** 881,884 **** --- 886,892 ---- </File> <File + RelativePath="res\Default.wav"> + </File> + <File RelativePath="res\wx\msw\disable.bmp"> </File> *************** *** 899,902 **** --- 907,916 ---- </File> <File + RelativePath="res\GCblue.ico"> + </File> + <File + RelativePath="res\GCblue.rc"> + </File> + <File RelativePath="res\wx\msw\hand.cur"> </File> *************** *** 948,951 **** --- 962,968 ---- </File> <File + RelativePath="wav\consolebeep.wav"> + </File> + <File RelativePath="wav\Explosion.wav"> </File> *************** *** 981,984 **** --- 998,1004 ---- </File> <File + RelativePath="wav\radarping.wav"> + </File> + <File RelativePath="wav\RejectBeep.wav"> </File> *************** *** 995,1004 **** RelativePath="wav\TwoBeeps.wav"> </File> - <File - RelativePath="wav\consolebeep.wav"> - </File> - <File - RelativePath="wav\radarping.wav"> - </File> </Filter> <Filter --- 1015,1018 ---- |
