[Hgengine-cvs] Mercury/src ode_single.lib, NONE, 1.1 Mercury-VC2008.vcproj, 1.1, 1.2 MercuryODE.cpp, 1.102, 1.103

[Charles L. <cn...@us...>]

Update of /cvsroot/hgengine/Mercury/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4378

Modified Files:
	Mercury-VC2008.vcproj MercuryODE.cpp 
Added Files:
	ode_single.lib 
Log Message:
Fix visual studio project file and transition over to ode 0.11

--- NEW FILE: ode_single.lib ---
(This appears to be a binary file; contents omitted.)

Index: MercuryODE.cpp
===================================================================
RCS file: /cvsroot/hgengine/Mercury/src/MercuryODE.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** MercuryODE.cpp	13 Feb 2009 03:56:51 -0000	1.102
--- MercuryODE.cpp	13 Feb 2009 07:22:57 -0000	1.103
***************
*** 8,12 ****
  #include "MercuryPoly.h"
  
! #if ( defined( HAVE_ODE_STATIC ) )
  extern "C"
  {
--- 8,12 ----
  #include "MercuryPoly.h"
  
! #if ( defined( HAVE_ODE_STATIC ) || ( defined(WIN32) && !defined(__GNUC__)) )
  extern "C"
  {
***************
*** 16,21 ****
  
  #if defined(WIN32) && !defined(__GNUC__)
! #pragma comment(lib, "ode.lib")
! void dInitODE() { } //XXX: The "ok" version for windows is REALLY old; before they had InitODE
  #endif
  
--- 16,20 ----
  
  #if defined(WIN32) && !defined(__GNUC__)
! #pragma comment(lib, "ode_single.lib")
  #endif
  
***************
*** 244,248 ****
  				{
  					dMass pTempCyl;
! 					pTempCyl.setCappedCylinder( fDensity, 1, 
  						pINI.GetValueF( sShapeName, sPieceName + "Radius", 1 ),
  						pINI.GetValueF( sShapeName, sPieceName + "Length", 1 )/2 );
--- 243,247 ----
  				{
  					dMass pTempCyl;
! 					pTempCyl.setCapsule( fDensity, 1, 
  						pINI.GetValueF( sShapeName, sPieceName + "Radius", 1 ),
  						pINI.GetValueF( sShapeName, sPieceName + "Length", 1 )/2 );

Index: Mercury-VC2008.vcproj
===================================================================
RCS file: /cvsroot/hgengine/Mercury/src/Mercury-VC2008.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mercury-VC2008.vcproj	3 Oct 2008 00:14:17 -0000	1.1
--- Mercury-VC2008.vcproj	13 Feb 2009 07:22:56 -0000	1.2
***************
*** 70,74 ****
  			<Tool
  				Name="VCPreLinkEventTool"
! 				CommandLine="Crash\windows\verinc2"
  			/>
  			<Tool
--- 70,74 ----
  			<Tool
  				Name="VCPreLinkEventTool"
! 				CommandLine=""
  			/>
  			<Tool
***************
*** 107,111 ****
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="Crash\Windows\mapconv2 $(IntDir)/$(TargetName).map $(TargetDir)$(TargetName).vdi"
  			/>
  		</Configuration>
--- 107,111 ----
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine=""
  			/>
  		</Configuration>
***************
*** 268,280 ****
  			<Tool
  				Name="VCPreLinkEventTool"
! 				CommandLine="Crash\windows\verinc2"
  			/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="OpenGL32.lib GLu32.lib odbc32.lib odbccp32.lib libpng.lib zdll.lib Winmm.lib freetype.lib ode.lib"
! 				OutputFile=".\../Release/Mercury-VC2003.exe"
  				LinkIncremental="2"
  				SuppressStartupBanner="true"
! 				IgnoreDefaultLibraryNames="libci.lib"
  				GenerateDebugInformation="false"
  				ProgramDatabaseFile=".\../Release/Mercury-VC2003.pdb"
--- 268,281 ----
  			<Tool
  				Name="VCPreLinkEventTool"
! 				CommandLine=""
  			/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="OpenGL32.lib GLu32.lib odbc32.lib odbccp32.lib libpng.lib zdll.lib Winmm.lib freetype.lib"
! 				OutputFile="C:\Mercury\Mercury.exe"
  				LinkIncremental="2"
  				SuppressStartupBanner="true"
! 				IgnoreAllDefaultLibraries="false"
! 				IgnoreDefaultLibraryNames="libci.lib,LIBCMT.lib,libcmt.lib"
  				GenerateDebugInformation="false"
  				ProgramDatabaseFile=".\../Release/Mercury-VC2003.pdb"
***************
*** 307,311 ****
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine="Crash\Windows\mapconv2 $(IntDir)\$(TargetName).map $(TargetDir)$(TargetName).vdi"
  			/>
  		</Configuration>
--- 308,312 ----
  			<Tool
  				Name="VCPostBuildEventTool"
! 				CommandLine=""
  			/>
  		</Configuration>
***************
*** 680,892 ****
  			>
  			<File
! 				RelativePath="Crash\archCrash.h"
! 				>
! 			</File>
! 			<File
! 				RelativePath="Crash\Windows\BACKUPCrash.h"
! 				>
! 			</File>
! 			<File
! 				RelativePath="Crash\Windows\Crash.cpp"
! 				>
! 				<FileConfiguration
! 					Name="Debug|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="AllIn|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="2"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Release|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="2"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug_Memory|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"
! 					/>
! 				</FileConfiguration>
! 			</File>
! 			<File
! 				RelativePath="Crash\Windows\Crash.h"
! 				>
! 			</File>
! 			<File
! 				RelativePath="Crash\crashDefines.cpp"
! 				>
! 				<FileConfiguration
! 					Name="Debug|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="AllIn|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="2"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Release|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="2"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug_Memory|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"
! 					/>
! 				</FileConfiguration>
! 			</File>
! 			<File
! 				RelativePath="Crash\crashDefines.h"
! 				>
! 			</File>
! 			<File
! 				RelativePath="Crash\Windows\RestartProgram.cpp"
! 				>
! 				<FileConfiguration
! 					Name="Debug|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="AllIn|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="2"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Release|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						Optimization="2"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 					/>
! 				</FileConfiguration>
! 				<FileConfiguration
! 					Name="Debug_Memory|Win32"
! 					>
! 					<Tool
! 						Name="VCCLCompilerTool"
! 						AdditionalIncludeDirectories=""
! 						PreprocessorDefinitions=""
! 						BasicRuntimeChecks="3"
! 						BrowseInformation="1"
! 					/>
! 				</FileConfiguration>
! 			</File>
! 			<File
! 				RelativePath="Crash\Windows\RestartProgram.h"
  				>
  			</File>
  			<File
! 				RelativePath="Crash\StdString.h"
  				>
  			</File>
  			<File
! 				RelativePath="Crash\Windows\verstub.cpp"
  				>
- 				<FileConfiguration
- 					Name="Debug|Win32"
- 					>
- 					<Tool
- 						Name="VCCLCompilerTool"
- 						AdditionalIncludeDirectories=""
- 						PreprocessorDefinitions=""
- 						BasicRuntimeChecks="3"
- 						BrowseInformation="1"
- 					/>
- 				</FileConfiguration>
- 				<FileConfiguration
- 					Name="AllIn|Win32"
- 					>
- 					<Tool
- 						Name="VCCLCompilerTool"
- 						Optimization="2"
- 						AdditionalIncludeDirectories=""
- 						PreprocessorDefinitions=""
- 					/>
- 				</FileConfiguration>
- 				<FileConfiguration
- 					Name="Release|Win32"
- 					>
- 					<Tool
- 						Name="VCCLCompilerTool"
- 						Optimization="2"
- 						AdditionalIncludeDirectories=""
- 						PreprocessorDefinitions=""
- 					/>
- 				</FileConfiguration>
- 				<FileConfiguration
- 					Name="Debug_Memory|Win32"
- 					>
- 					<Tool
- 						Name="VCCLCompilerTool"
- 						AdditionalIncludeDirectories=""
- 						PreprocessorDefinitions=""
- 						BasicRuntimeChecks="3"
- 						BrowseInformation="1"
- 					/>
- 				</FileConfiguration>
  			</File>
  			<File
! 				RelativePath="Crash\Windows\WindowsResources.h"
  				>
  			</File>
--- 681,697 ----
  			>
  			<File
! 				RelativePath=".\Crash\cnbacktrace.c"
  				>
  			</File>
  			<File
! 				RelativePath=".\Crash\cnbacktrace.h"
  				>
  			</File>
  			<File
! 				RelativePath=".\Crash\cncrash.c"
  				>
  			</File>
  			<File
! 				RelativePath=".\Crash\cncrash.h"
  				>
  			</File>