[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL CSPSimDLL.vcproj,1.14,1.15

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL
In directory sc8-pr-cvs1:/tmp/cvs-serv437

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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CSPSimDLL.vcproj	20 Oct 2003 00:23:24 -0000	1.14
--- CSPSimDLL.vcproj	28 Dec 2003 20:25:21 -0000	1.15
***************
*** 24,29 ****
  				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"
  				RuntimeLibrary="3"
--- 24,29 ----
  				AdditionalOptions="/Zm1000"
  				Optimization="0"
! 				AdditionalIncludeDirectories="C:\Python23\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include"
! 				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;CSPSIMDLL_EXPORTS"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="3"
***************
*** 43,51 ****
  				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="../../Bin/_cCSPd.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="C:/Python22/Lib/site-packages/SimData,C:/Python22/libs, ../../../../THIRDPARTYLIBS/lib"
  				IgnoreDefaultLibraryNames="msvcrt.lib"
  				GenerateDebugInformation="TRUE"
--- 43,51 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="sigc-1.2d.lib producerd.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"
! 				AdditionalLibraryDirectories="C:/Python23/Lib/site-packages/SimData,C:/Python23/libs, ../../../../THIRDPARTYLIBS/lib"
  				IgnoreDefaultLibraryNames="msvcrt.lib"
  				GenerateDebugInformation="TRUE"
***************
*** 93,98 ****
  				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"
  				RuntimeLibrary="2"
--- 93,98 ----
  				AdditionalOptions="/Zm1000"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="TRUE"
  				RuntimeLibrary="2"
***************
*** 103,109 ****
  				ObjectFile=".\Release/"
  				ProgramDataBaseFileName=".\Release/"
  				WarningLevel="3"
  				SuppressStartupBanner="TRUE"
! 				CompileAs="0"/>
  			<Tool
  				Name="VCCustomBuildTool"/>
--- 103,111 ----
  				ObjectFile=".\Release/"
  				ProgramDataBaseFileName=".\Release/"
+ 				BrowseInformation="0"
  				WarningLevel="3"
  				SuppressStartupBanner="TRUE"
! 				DebugInformationFormat="3"
! 				CompileAs="2"/>
  			<Tool
  				Name="VCCustomBuildTool"/>
***************
*** 111,120 ****
  				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"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python22/libs,C:/Python22/Lib/site-packages/SimData"
! 				ImportLibrary=".\Release/_CSP.lib"/>
  			<Tool
  				Name="VCMIDLTool"
--- 113,127 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib  sigc-1.2.lib OpenThreadsWin32.lib"
  				OutputFile="../../Bin/_cCSP.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python23/libs,C:/Python23/Lib/site-packages/SimData"
! 				GenerateDebugInformation="TRUE"
! 				AssemblyDebug="0"
! 				GenerateMapFile="FALSE"
! 				MapExports="FALSE"
! 				ImportLibrary=".\Release/_CSP.lib"
! 				TargetMachine="1"/>
  			<Tool
  				Name="VCMIDLTool"
***************
*** 180,184 ****
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
  				</FileConfiguration>
  				<FileConfiguration
--- 187,192 ----
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"
! 						UndefinePreprocessorDefinitions="_DEBUG"/>
  				</FileConfiguration>
  				<FileConfiguration
***************
*** 186,190 ****
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
  				</FileConfiguration>
  			</File>
--- 194,199 ----
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"
! 						UndefinePreprocessorDefinitions="_DEBUG"/>
  				</FileConfiguration>
  			</File>
***************
*** 197,206 ****
  						Name="VCCLCompilerTool"/>
  				</FileConfiguration>
- 				<FileConfiguration
- 					Name="Release|Win32"
- 					ExcludedFromBuild="TRUE">
- 					<Tool
- 						Name="VCCLCompilerTool"/>
- 				</FileConfiguration>
  			</File>
  			<File
--- 206,209 ----
***************
*** 484,490 ****
  			</File>
  			<File
- 				RelativePath="..\..\Include\GlibCsp.h">
- 			</File>
- 			<File
  				RelativePath="..\..\Include\HID.h">
  			</File>
--- 487,490 ----
***************
*** 502,505 ****
--- 502,508 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Include\MapEvent.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Include\MenuScreen.h">
  			</File>
***************
*** 544,550 ****
  			</File>
  			<File
- 				RelativePath="..\..\Include\stdinc.h">
- 			</File>
- 			<File
  				RelativePath="..\..\Include\SynchronousUpdate.h">
  			</File>
--- 547,550 ----
***************
*** 568,575 ****
  			</File>
  			<File
! 				RelativePath="..\..\Include\VehicleModel.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\VirtualBattlefield.h">
  			</File>
  			<Filter
--- 568,575 ----
  			</File>
  			<File
! 				RelativePath="..\..\Include\VirtualBattlefield.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\VirtualScene.h">
  			</File>
  			<Filter
***************
*** 655,659 ****
  				<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"/>
--- 655,659 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python23\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"/>
--- 663,667 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>