opal-commits

[Olex <ole...@us...>]

Update of /cvsroot/opal/opal/scripts/vc8
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4690/scripts/vc8

Modified Files:
	opal-ode.vcproj opal.sln 
Log Message:
Fixes for Windows linking.

Index: opal-ode.vcproj
===================================================================
RCS file: /cvsroot/opal/opal/scripts/vc8/opal-ode.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** opal-ode.vcproj	9 Dec 2005 17:52:50 -0000	1.1
--- opal-ode.vcproj	11 Dec 2005 04:43:05 -0000	1.2
***************
*** 50,53 ****
--- 50,54 ----
  				BasicRuntimeChecks="0"
  				RuntimeLibrary="3"
+ 				FloatingPointModel="2"
  				UsePrecompiledHeader="0"
  				WarningLevel="3"
***************
*** 68,72 ****
  				AdditionalDependencies="oded.lib OPCODE_d.lib"
  				OutputFile="$(OutDir)/opal-ode_d.dll"
! 				AdditionalLibraryDirectories="C:\Olex\work\ode-0.5\lib"
  				IgnoreDefaultLibraryNames="libcmt"
  				GenerateDebugInformation="true"
--- 69,73 ----
  				AdditionalDependencies="oded.lib OPCODE_d.lib"
  				OutputFile="$(OutDir)/opal-ode_d.dll"
! 				AdditionalLibraryDirectories=""
  				IgnoreDefaultLibraryNames="libcmt"
  				GenerateDebugInformation="true"
***************
*** 128,131 ****
--- 129,133 ----
  				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPAL_DLL_EXPORTING;OPAL_USE_DOUBLE"
  				RuntimeLibrary="2"
+ 				FloatingPointModel="2"
  				UsePrecompiledHeader="0"
  				WarningLevel="3"
***************
*** 146,150 ****
  				AdditionalDependencies="ode.lib OPCODE.lib"
  				OutputFile="$(OutDir)/opal-ode.dll"
! 				AdditionalLibraryDirectories=""C:\Olex\work\ode-0.5\lib""
  				IgnoreDefaultLibraryNames="libcmt"
  				OptimizeReferences="2"
--- 148,152 ----
  				AdditionalDependencies="ode.lib OPCODE.lib"
  				OutputFile="$(OutDir)/opal-ode.dll"
! 				AdditionalLibraryDirectories=""
  				IgnoreDefaultLibraryNames="libcmt"
  				OptimizeReferences="2"
***************
*** 184,280 ****
  			>
  			<File
! 				RelativePath="..\src\AccelerationSensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\AttractorMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Blueprint.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\BlueprintInstance.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\BlueprintManager.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\CollisionEventHandler.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\GearedMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\InclineSensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Joint.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Logger.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Motor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Point3r.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Quaternion.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\RaycastSensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Sensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\ServoMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Simulator.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Solid.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\SolidData.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Space.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\SpringMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\ThrusterMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Vec3r.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\VolumeSensor.cpp"
  				>
  			</File>
--- 186,286 ----
  			>
  			<File
! 				RelativePath="..\..\src\AccelerationSensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\AttractorMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Blueprint.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\BlueprintInstance.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\BlueprintManager.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\CollisionEventHandler.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\GearedMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\InclineSensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Joint.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Logger.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Motor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Point3r.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Quaternion.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\RaycastSensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Sensor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\ServoMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Simulator.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Solid.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\SolidData.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Space.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\SpringMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\ThrusterMotor.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Vec3r.cpp"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\VelocityMotor.cpp"
! 				>
! 			</File>
! 			<File
! 				RelativePath="..\..\src\VolumeSensor.cpp"
  				>
  			</File>
***************
*** 284,472 ****
  			>
  			<File
! 				RelativePath="..\src\AccelerationSensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\AccelerationSensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\AttractorMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\AttractorMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Blueprint.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\BlueprintInstance.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\BlueprintManager.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\BoxShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\CapsuleShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\CollisionEventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Defines.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\EventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\GearedMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\GearedMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\InclineSensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\InclineSensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Joint.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\JointBreakEventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\JointData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Logger.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Mass.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\MeshShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Motor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\MotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\opal.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\PlaneShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Portability.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\PostStepEventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\RaycastSensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\RaycastSensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Sensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\SensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\ServoMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\ServoMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\ShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Simulator.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Singleton.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Solid.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\SolidData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Space.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\SphereShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\SpringMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\SpringMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\ThrusterMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\ThrusterMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\VolumeSensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\VolumeSensorData.h"
  				>
  			</File>
--- 290,486 ----
  			>
  			<File
! 				RelativePath="..\..\src\AccelerationSensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\AccelerationSensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\AttractorMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\AttractorMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Blueprint.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\BlueprintInstance.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\BlueprintManager.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\BoxShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\CapsuleShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\CollisionEventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Defines.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\EventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\GearedMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\GearedMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\InclineSensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\InclineSensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Joint.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\JointBreakEventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\JointData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Logger.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Mass.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\MeshShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Motor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\MotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\opal.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\PlaneShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Portability.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\PostStepEventHandler.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\RaycastSensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\RaycastSensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Sensor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\SensorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\ServoMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\ServoMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\ShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Simulator.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Singleton.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Solid.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\SolidData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Space.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\SphereShapeData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\SpringMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\SpringMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\ThrusterMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\ThrusterMotorData.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\VelocityMotor.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\VelocityMotorData.h"
! 				>
! 			</File>
! 			<File
! 				RelativePath="..\..\src\VolumeSensor.h"
! 				>
! 			</File>
! 			<File
! 				RelativePath="..\..\src\VolumeSensorData.h"
  				>
  			</File>
***************
*** 479,495 ****
  				>
  				<File
! 					RelativePath="..\src\Ode\ODEJoint.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\Ode\ODESimulator.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\Ode\ODESolid.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\Ode\ODESpace.cpp"
  					>
  				</File>
--- 493,509 ----
  				>
  				<File
! 					RelativePath="..\..\src\Ode\ODEJoint.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\Ode\ODESimulator.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\Ode\ODESolid.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\Ode\ODESpace.cpp"
  					>
  				</File>
***************
*** 499,515 ****
  				>
  				<File
! 					RelativePath="..\src\Ode\ODEJoint.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\Ode\ODESimulator.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\Ode\ODESolid.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\Ode\ODESpace.h"
  					>
  				</File>
--- 513,529 ----
  				>
  				<File
! 					RelativePath="..\..\src\Ode\ODEJoint.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\Ode\ODESimulator.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\Ode\ODESolid.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\Ode\ODESpace.h"
  					>
  				</File>
***************
*** 520,544 ****
  			>
  			<File
! 				RelativePath="..\src\Matrix44r.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\OpalMath.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Point3r.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Quaternion.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Rayr.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\src\Vec3r.h"
  				>
  			</File>
--- 534,558 ----
  			>
  			<File
! 				RelativePath="..\..\src\Matrix44r.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\OpalMath.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Point3r.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Quaternion.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Rayr.h"
  				>
  			</File>
  			<File
! 				RelativePath="..\..\src\Vec3r.h"
  				>
  			</File>
***************
*** 551,567 ****
  				>
  				<File
! 					RelativePath="..\src\external\tinyxml\tinystr.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\external\tinyxml\tinyxml.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\external\tinyxml\tinyxmlerror.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\external\tinyxml\tinyxmlparser.cpp"
  					>
  				</File>
--- 565,581 ----
  				>
  				<File
! 					RelativePath="..\..\src\external\tinyxml\tinystr.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\external\tinyxml\tinyxml.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\external\tinyxml\tinyxmlerror.cpp"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\external\tinyxml\tinyxmlparser.cpp"
  					>
  				</File>
***************
*** 571,579 ****
  				>
  				<File
! 					RelativePath="..\src\external\tinyxml\tinystr.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\src\external\tinyxml\tinyxml.h"
  					>
  				</File>
--- 585,593 ----
  				>
  				<File
! 					RelativePath="..\..\src\external\tinyxml\tinystr.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\..\src\external\tinyxml\tinyxml.h"
  					>
  				</File>

Index: opal.sln
===================================================================
RCS file: /cvsroot/opal/opal/scripts/vc8/opal.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** opal.sln	9 Dec 2005 17:52:50 -0000	1.1
--- opal.sln	11 Dec 2005 04:43:05 -0000	1.2
***************
*** 3,7 ****
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opal-ode", "opal-ode.vcproj", "{312196D4-105B-4444-A33A-2ECE3C7D6D64}"
  EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "..\unittests\unittests.vcproj", "{A211B4F7-11A8-4392-9934-ABAE5B31BDA8}"
  	ProjectSection(ProjectDependencies) = postProject
  		{312196D4-105B-4444-A33A-2ECE3C7D6D64} = {312196D4-105B-4444-A33A-2ECE3C7D6D64}
--- 3,7 ----
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opal-ode", "opal-ode.vcproj", "{312196D4-105B-4444-A33A-2ECE3C7D6D64}"
  EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "unittests\unittests.vcproj", "{6C9403A9-2A58-4E15-B33F-31299A4A2377}"
  	ProjectSection(ProjectDependencies) = postProject
  		{312196D4-105B-4444-A33A-2ECE3C7D6D64} = {312196D4-105B-4444-A33A-2ECE3C7D6D64}
***************
*** 18,25 ****
  		{312196D4-105B-4444-A33A-2ECE3C7D6D64}.Release|Win32.ActiveCfg = Release|Win32
  		{312196D4-105B-4444-A33A-2ECE3C7D6D64}.Release|Win32.Build.0 = Release|Win32
! 		{A211B4F7-11A8-4392-9934-ABAE5B31BDA8}.Debug|Win32.ActiveCfg = Debug|Win32
! 		{A211B4F7-11A8-4392-9934-ABAE5B31BDA8}.Debug|Win32.Build.0 = Debug|Win32
! 		{A211B4F7-11A8-4392-9934-ABAE5B31BDA8}.Release|Win32.ActiveCfg = Release|Win32
! 		{A211B4F7-11A8-4392-9934-ABAE5B31BDA8}.Release|Win32.Build.0 = Release|Win32
  	EndGlobalSection
  	GlobalSection(SolutionProperties) = preSolution
--- 18,25 ----
  		{312196D4-105B-4444-A33A-2ECE3C7D6D64}.Release|Win32.ActiveCfg = Release|Win32
  		{312196D4-105B-4444-A33A-2ECE3C7D6D64}.Release|Win32.Build.0 = Release|Win32
! 		{6C9403A9-2A58-4E15-B33F-31299A4A2377}.Debug|Win32.ActiveCfg = Debug|Win32
! 		{6C9403A9-2A58-4E15-B33F-31299A4A2377}.Debug|Win32.Build.0 = Debug|Win32
! 		{6C9403A9-2A58-4E15-B33F-31299A4A2377}.Release|Win32.ActiveCfg = Release|Win32
! 		{6C9403A9-2A58-4E15-B33F-31299A4A2377}.Release|Win32.Build.0 = Release|Win32
  	EndGlobalSection
  	GlobalSection(SolutionProperties) = preSolution