From: <mk...@us...> - 2003-10-20 04:18:41
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv17617/VisualStudio/CSPSimDLL Modified Files: CSPSimDLL.vcproj Log Message: Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CSPSimDLL.vcproj 19 Jul 2003 14:08:52 -0000 1.13 --- CSPSimDLL.vcproj 20 Oct 2003 00:23:24 -0000 1.14 *************** *** 1,7 **** ! <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.00" Name="CSPSimDLL" SccProjectName="" SccLocalPath=""> --- 1,8 ---- ! <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" ! Version="7.10" Name="CSPSimDLL" + RootNamespace="CSPSimDLL" SccProjectName="" SccLocalPath=""> *************** *** 23,27 **** AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories="C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" --- 24,28 ---- AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories=""E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config";E:\CSP\THIRDPARTYLIBS\OpenThreads\include;E:\CSP\THIRDPARTYLIBS\Producer\include;"E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5";C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" *************** *** 72,76 **** --- 73,83 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration *************** *** 86,90 **** AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" --- 93,97 ---- AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="E:\CSP\THIRDPARTYLIBS\OpenThreads\include;"E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config";E:\CSP\THIRDPARTYLIBS\Producer\include;"E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5";../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include" PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" *************** *** 104,108 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" --- 111,115 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib sigc-1.2.lib OpenThreadsWin32.lib" OutputFile="../../Bin/_cCSP.dll" LinkIncremental="1" *************** *** 131,137 **** --- 138,152 ---- Name="VCWebServiceProxyGeneratorTool"/> <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> + <References> + </References> <Files> <Filter *************** *** 151,154 **** --- 166,172 ---- </File> <File + RelativePath="..\..\Source\base.cpp"> + </File> + <File RelativePath="..\..\Source\BaseDynamics.cpp"> </File> *************** *** 157,161 **** </File> <File ! RelativePath="..\..\Source\CSPSim.cpp"> </File> <File --- 175,191 ---- </File> <File ! RelativePath="..\..\Source\cCSP_wrap.cpp"> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> ! <FileConfiguration ! Name="Release|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> </File> <File *************** *** 190,197 **** </File> <File ! RelativePath="..\..\Source\DemeterTerrain.cpp"> </File> <File ! RelativePath="..\..\Source\DynamicObject.cpp"> </File> <File --- 220,227 ---- </File> <File ! RelativePath="..\..\Source\CSPSim.cpp"> </File> <File ! RelativePath="..\..\Source\DemeterTerrain.cpp"> </File> <File *************** *** 199,202 **** --- 229,235 ---- </File> <File + RelativePath="..\..\Source\DynamicObject.cpp"> + </File> + <File RelativePath="..\..\Source\Engine.cpp"> </File> *************** *** 226,229 **** --- 259,265 ---- </File> <File + RelativePath="..\..\Source\KineticsChannels.cpp"> + </File> + <File RelativePath="..\..\Source\LandingGear.cpp"> </File> *************** *** 250,256 **** </File> <File - RelativePath="..\..\Source\PrimaryAeroDynamics.cpp"> - </File> - <File RelativePath="..\..\Source\ScreenInfo.cpp"> </File> --- 286,289 ---- *************** *** 274,314 **** </File> <File ! RelativePath="..\..\Source\TankObject.cpp"> </File> <File ! RelativePath="..\..\Source\TerrainObject.cpp"> </File> <File ! RelativePath="..\..\Source\Theater.cpp"> </File> <File ! RelativePath="..\..\Source\Tools.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualBattlefield.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualScene.cpp"> </File> <File ! RelativePath="..\..\Source\base.cpp"> </File> <File ! RelativePath="..\..\Source\cCSP_wrap.cpp"> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> ! <FileConfiguration ! Name="Release|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! PreprocessorDefinitions="SWIG_NOINCLUDE"/> ! </FileConfiguration> </File> <File ! RelativePath="..\..\Source\trees.cpp"> </File> <Filter --- 307,338 ---- </File> <File ! RelativePath="..\..\Source\SynchronousUpdate.cpp"> </File> <File ! RelativePath="..\..\Source\System.cpp"> </File> <File ! RelativePath="..\..\Source\SystemsModel.cpp"> </File> <File ! RelativePath="..\..\Source\TankObject.cpp"> </File> <File ! RelativePath="..\..\Source\TerrainObject.cpp"> </File> <File ! RelativePath="..\..\Source\Theater.cpp"> </File> <File ! RelativePath="..\..\Source\Tools.cpp"> </File> <File ! RelativePath="..\..\Source\trees.cpp"> </File> <File ! RelativePath="..\..\Source\VirtualBattlefield.cpp"> ! </File> ! <File ! RelativePath="..\..\Source\VirtualScene.cpp"> </File> <Filter *************** *** 358,361 **** --- 382,398 ---- </File> </Filter> + <Filter + Name="Systems" + Filter=""> + <File + RelativePath="..\..\Source\Systems\AircraftFlightSensors.cpp"> + </File> + <File + RelativePath="..\..\Source\Systems\AircraftInputSystem.cpp"> + </File> + <File + RelativePath="..\..\Source\Systems\AircraftSimpleFCS.cpp"> + </File> + </Filter> </Filter> <Filter *************** *** 387,391 **** </File> <File ! RelativePath="..\..\Include\CSPSim.h"> </File> <File --- 424,428 ---- </File> <File ! RelativePath="..\..\Include\Bus.h"> </File> <File *************** *** 399,402 **** --- 436,442 ---- </File> <File + RelativePath="..\..\Include\compiler.h"> + </File> + <File RelativePath="..\..\Include\Config.h"> </File> *************** *** 405,415 **** </File> <File RelativePath="..\..\Include\DataRecorder.h"> </File> <File ! RelativePath="..\..\Include\DemeterTerrain.h"> </File> <File ! RelativePath="..\..\Include\DynamicObject.h"> </File> <File --- 445,458 ---- </File> <File + RelativePath="..\..\Include\CSPSim.h"> + </File> + <File RelativePath="..\..\Include\DataRecorder.h"> </File> <File ! RelativePath="..\..\Include\debug_types.h"> </File> <File ! RelativePath="..\..\Include\DemeterTerrain.h"> </File> <File *************** *** 417,420 **** --- 460,466 ---- </File> <File + RelativePath="..\..\Include\DynamicObject.h"> + </File> + <File RelativePath="..\..\Include\Engine.h"> </File> *************** *** 474,480 **** </File> <File - RelativePath="..\..\Include\PrimaryAeroDynamics.h"> - </File> - <File RelativePath="..\..\Include\Profile.h"> </File> --- 520,523 ---- *************** *** 501,529 **** </File> <File ! RelativePath="..\..\Include\TankObject.h"> </File> <File ! RelativePath="..\..\Include\TerrainObject.h"> </File> <File ! RelativePath="..\..\Include\Theater.h"> </File> <File ! RelativePath="..\..\Include\Tools.h"> </File> <File ! RelativePath="..\..\Include\VehicleModel.h"> </File> <File ! RelativePath="..\..\Include\VirtualBattlefield.h"> </File> <File ! RelativePath="..\..\Include\compiler.h"> </File> <File ! RelativePath="..\..\Include\debug_types.h"> </File> <File ! RelativePath="..\..\Include\stdinc.h"> </File> <Filter --- 544,575 ---- </File> <File ! RelativePath="..\..\Include\stdinc.h"> </File> <File ! RelativePath="..\..\Include\SynchronousUpdate.h"> </File> <File ! RelativePath="..\..\Include\System.h"> </File> <File ! RelativePath="..\..\Include\SystemsModel.h"> </File> <File ! RelativePath="..\..\Include\TankObject.h"> </File> <File ! RelativePath="..\..\Include\TerrainObject.h"> </File> <File ! RelativePath="..\..\Include\Theater.h"> </File> <File ! RelativePath="..\..\Include\Tools.h"> </File> <File ! RelativePath="..\..\Include\VehicleModel.h"> ! </File> ! <File ! RelativePath="..\..\Include\VirtualBattlefield.h"> </File> <Filter *************** *** 579,582 **** --- 625,647 ---- </File> </Filter> + <Filter + Name="Systems" + Filter=""> + <File + RelativePath="..\..\Include\Systems\AircraftDynamics.h"> + </File> + <File + RelativePath="..\..\Include\Systems\AircraftFlightSensors.h"> + </File> + <File + RelativePath="..\..\Include\Systems\AircraftInputSystem.h"> + </File> + <File + RelativePath="..\..\Include\Systems\AircraftSimpleFCS.h"> + </File> + <File + RelativePath="..\..\Include\Systems\GearDynamics.h"> + </File> + </Filter> </Filter> <Filter *************** *** 598,602 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> --- 663,667 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> |