From: <de...@us...> - 2003-06-30 22:31:38
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL In directory sc8-pr-cvs1:/tmp/cvs-serv25850 Modified Files: CSPSimDLL.vcproj Log Message: *** see CHANGES.current *** Index: CSPSimDLL.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CSPSimDLL.vcproj 19 Jun 2003 19:15:28 -0000 1.10 --- CSPSimDLL.vcproj 30 Jun 2003 22:31:35 -0000 1.11 *************** *** 23,27 **** AdditionalOptions="/Zm1000" Optimization="0" ! AdditionalIncludeDirectories="C:/Python22/include,../../../SimData/Include,../../Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/demeter" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" BasicRuntimeChecks="3" --- 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" *************** *** 42,47 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib" ! OutputFile=".\Debug/CSPSimDLL.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" --- 42,47 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLodd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib" ! OutputFile="../../Bin/_cCSPd.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" *************** *** 86,90 **** AdditionalOptions="/Zm1000" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="../../Include,C:/Python22/include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/demeter" PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS" StringPooling="TRUE" --- 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" *************** *** 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" --- 104,108 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="osgChunkLod.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/_cCSP.dll" LinkIncremental="1" *************** *** 139,161 **** Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="..\..\Source\AircraftModel.cpp"> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCLCompilerTool"/> - </FileConfiguration> - </File> - <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicModel.cpp"> </File> <File --- 139,146 ---- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\..\Source\AircraftObject.cpp"> </File> <File ! RelativePath="..\..\Source\AircraftPhysicsModel.cpp"> </File> <File *************** *** 172,175 **** --- 157,163 ---- </File> <File + RelativePath="..\..\Source\ChunkLodTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\Collision.cpp"> </File> *************** *** 187,190 **** --- 175,181 ---- </File> <File + RelativePath="..\..\Source\DemeterTerrain.cpp"> + </File> + <File RelativePath="..\..\Source\DynamicObject.cpp"> </File> *************** *** 205,211 **** </File> <File - RelativePath="..\..\Source\F16Model.cpp"> - </File> - <File RelativePath="..\..\Source\GameScreen.cpp"> </File> --- 196,199 ---- *************** *** 238,242 **** </File> <File ! RelativePath="..\..\Source\PhysicModel.cpp"> </File> <File --- 226,230 ---- </File> <File ! RelativePath="..\..\Source\PhysicsModel.cpp"> </File> <File *************** *** 256,259 **** --- 244,250 ---- </File> <File + RelativePath="..\..\Source\Sky.cpp"> + </File> + <File RelativePath="..\..\Source\SmokeEffects.cpp"> </File> *************** *** 284,294 **** <File RelativePath="..\..\Source\cCSP_wrap.cpp"> ! </File> ! <File ! RelativePath="..\..\Source\sky.cpp"> </File> <File RelativePath="..\..\Source\trees.cpp"> </File> </Filter> <Filter --- 275,340 ---- <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 + 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 *************** *** 299,302 **** --- 345,351 ---- </File> <File + RelativePath="..\..\Include\AircraftPhysicsModel.h"> + </File> + <File RelativePath="..\..\Include\Atmosphere.h"> </File> *************** *** 317,320 **** --- 366,372 ---- </File> <File + RelativePath="..\..\Include\ChunkLodTerrain.h"> + </File> + <File RelativePath="..\..\Include\Collision.h"> </File> *************** *** 329,332 **** --- 381,387 ---- </File> <File + RelativePath="..\..\Include\DemeterTerrain.h"> + </File> + <File RelativePath="..\..\Include\DynamicObject.h"> </File> *************** *** 362,366 **** </File> <File ! RelativePath="..\..\Include\LogStream.h"> </File> <File --- 417,421 ---- </File> <File ! RelativePath="..\..\Include\Log.h"> </File> <File *************** *** 383,387 **** </File> <File ! RelativePath="..\..\Include\PhysicModel.h"> </File> <File --- 438,442 ---- </File> <File ! RelativePath="..\..\Include\PhysicsModel.h"> </File> <File *************** *** 389,392 **** --- 444,450 ---- </File> <File + RelativePath="..\..\Include\Profile.h"> + </File> + <File RelativePath="..\..\Include\ScreenInfo.h"> </File> *************** *** 436,439 **** --- 494,549 ---- RelativePath="..\..\Include\stdinc.h"> </File> + <Filter + Name="Theater" + Filter=""> + <File + RelativePath="..\..\Include\Theater\CustomLayoutModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\ElevationCorrection.h"> + </File> + <File + RelativePath="..\..\Include\Theater\Feature.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureGroup.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureGroupList.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureGroupModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureLayout.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureObjectModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureQuad.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureSceneGroup.h"> + </File> + <File + RelativePath="..\..\Include\Theater\FeatureSceneModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\LayoutTransform.h"> + </File> + <File + RelativePath="..\..\Include\Theater\Objective.h"> + </File> + <File + RelativePath="..\..\Include\Theater\RandomBillboardModel.h"> + </File> + <File + RelativePath="..\..\Include\Theater\RandomForestModel.h"> + </File> + </Filter> </Filter> <Filter *************** *** 447,451 **** <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"/> --- 557,561 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DSWIG_NOINCLUDE -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i " Outputs="..\..\Source\$(InputName)_wrap.cpp"/> |