From: <de...@us...> - 2003-06-30 22:31:50
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli In directory sc8-pr-cvs1:/tmp/cvs-serv25873 Modified Files: CSPSimAppli.vcproj Log Message: *** see CHANGES.current *** Index: CSPSimAppli.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CSPSimAppli.vcproj 19 Jun 2003 19:15:16 -0000 1.8 --- CSPSimAppli.vcproj 30 Jun 2003 22:31:47 -0000 1.9 *************** *** 23,27 **** AdditionalOptions="/Zm200" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" PreprocessorDefinitions="CSP_NDEBUG;WIN32,NDEBUG,_WINDOWS,__CSPSIM_EXE__" StringPooling="TRUE" --- 23,27 ---- AdditionalOptions="/Zm200" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include;../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" PreprocessorDefinitions="CSP_NDEBUG;WIN32,NDEBUG,_WINDOWS,__CSPSIM_EXE__" StringPooling="TRUE" *************** *** 41,45 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/CSPSim.exe" LinkIncremental="1" --- 41,45 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLod.lib SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib" OutputFile="../../Bin/CSPSim.exe" LinkIncremental="1" *************** *** 82,86 **** AdditionalOptions="/Zm200" Optimization="0" ! AdditionalIncludeDirectories="../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,__CSPSIM_EXE__" BasicRuntimeChecks="3" --- 82,86 ---- AdditionalOptions="/Zm200" Optimization="0" ! AdditionalIncludeDirectories="..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\Demeter;C:\Python22\include" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,__CSPSIM_EXE__" BasicRuntimeChecks="3" *************** *** 102,110 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib odbc32.lib odbccp32.lib" ! OutputFile="../../Bin/CSPSimd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="C:\Python22\Lib\site-packages\SimData,C:/Python22/libs,../../../../THIRDPARTYLIBS/lib" IgnoreDefaultLibraryNames="msvcrt.lib" GenerateDebugInformation="TRUE" --- 102,110 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLodd.lib DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib odbc32.lib odbccp32.lib" ! OutputFile="..\..\Bin\CSPSimd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="C:\Python22\Lib\site-packages\SimData,C:\Python22\libs,..\..\..\..\THIRDPARTYLIBS\lib" IgnoreDefaultLibraryNames="msvcrt.lib" GenerateDebugInformation="TRUE" *************** *** 140,162 **** Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="..\..\Source\AircraftModel.cpp"> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - </File> - <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicModel.cpp"> </File> <File --- 140,147 ---- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicsModel.cpp"> </File> <File *************** *** 173,176 **** --- 158,164 ---- </File> <File + RelativePath="..\..\Source\ChunkLodTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\Collision.cpp"> </File> *************** *** 188,191 **** --- 176,182 ---- </File> <File + RelativePath="..\..\Source\DemeterTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\DynamicObject.cpp"> </File> *************** *** 206,212 **** </File> <File - RelativePath="..\..\Source\F16Model.cpp"> - </File> - <File RelativePath="..\..\Source\GameScreen.cpp"> </File> --- 197,200 ---- *************** *** 239,243 **** </File> <File ! RelativePath="..\..\Source\PhysicModel.cpp"> </File> <File --- 227,231 ---- </File> <File ! RelativePath="..\..\Source\PhysicsModel.cpp"> </File> <File *************** *** 257,260 **** --- 245,251 ---- </File> <File + RelativePath="..\..\Source\Sky.cpp"> + </File> + <File RelativePath="..\..\Source\SmokeEffects.cpp"> </File> *************** *** 285,288 **** --- 276,291 ---- <File RelativePath="..\..\Source\cCSP_wrap.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="SWIG_NOINCLUDE"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="SWIG_NOINCLUDE"/> + </FileConfiguration> </File> <File *************** *** 290,298 **** </File> <File - RelativePath="..\..\Source\sky.cpp"> - </File> - <File RelativePath="..\..\Source\trees.cpp"> </File> </Filter> <Filter --- 293,344 ---- </File> <File RelativePath="..\..\Source\trees.cpp"> </File> + <Filter + Name="Theater" + Filter=""> + <File + RelativePath="..\..\Source\Theater\CustomLayoutModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\DamageModifier.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\ElevationCorrection.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\Feature.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureGroup.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureGroupList.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureLayout.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureObjectModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureQuad.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\FeatureSceneModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\LayoutTransform.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\Objective.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\RandomBillboardModel.cpp"> + </File> + <File + RelativePath="..\..\Source\Theater\RandomForestModel.cpp"> + </File> + </Filter> </Filter> <Filter *************** *** 303,309 **** </File> <File - RelativePath="..\..\Include\AircraftPhysicModel.h"> - </File> - <File RelativePath="..\..\Include\Atmosphere.h"> </File> --- 349,352 ---- *************** *** 375,379 **** </File> <File ! RelativePath="..\..\Include\LogStream.h"> </File> <File --- 418,422 ---- </File> <File ! RelativePath="..\..\Include\Log.h"> </File> <File *************** *** 396,403 **** </File> <File ! RelativePath="..\..\Include\PhysicModel.h"> </File> <File ! RelativePath="..\..\Include\PrimaryAeroDynamics.h"> </File> <File --- 439,446 ---- </File> <File ! RelativePath="..\..\Include\PrimaryAeroDynamics.h"> </File> <File ! RelativePath="..\..\Include\Profile.h"> </File> <File |