[simspark-cvs] simspark/spark/oxygen oxygen.vcproj, 1.1, 1.2 Makefile.am, 1.3, 1.4

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/oxygen

Modified Files:
	Makefile.am 
Added Files:
	oxygen.vcproj 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	14 Apr 2006 16:27:26 -0000	1.3
--- Makefile.am	15 Mar 2007 07:26:26 -0000	1.4
***************
*** 167,173 ****
  nobase_libpkginclude_HEADERS = \
  agentaspect/agentaspect.h \
  agentaspect/effector.h \
  agentaspect/perceptor.h \
- agentaspect/createaction.h \
  controlaspect/controlaspect.h \
  gamecontrolserver/predicate.h \
--- 167,175 ----
  nobase_libpkginclude_HEADERS = \
  agentaspect/agentaspect.h \
+ agentaspect/createaction.h \
  agentaspect/effector.h \
+ agentaspect/jointeffector.h \
+ agentaspect/jointperceptor.h \
  agentaspect/perceptor.h \
  controlaspect/controlaspect.h \
  gamecontrolserver/predicate.h \
***************
*** 183,187 ****
--- 185,191 ----
  physicsserver/collisionhandler.h \
  physicsserver/contactjointhandler.h \
+ physicsserver/dragcontroller.h \
  physicsserver/odeobject.h \
+ physicsserver/odewrapper.h \
  physicsserver/physicsserver.h \
  physicsserver/planecollider.h \
***************
*** 190,195 ****
  physicsserver/space.h \
  physicsserver/spherecollider.h \
  physicsserver/world.h \
- physicsserver/dragcontroller.h \
  physicsserver/velocitycontroller.h \
  physicsserver/joint.h \
--- 194,199 ----
  physicsserver/space.h \
  physicsserver/spherecollider.h \
+ physicsserver/transformcollider.h \
  physicsserver/world.h \
  physicsserver/velocitycontroller.h \
  physicsserver/joint.h \

--- NEW FILE: oxygen.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="oxygen"
	ProjectGUID="{DAB59CC4-E184-40CC-A858-27C432A53AAB}"
	RootNamespace="oxygen"
	Keyword="Win32Proj"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="4"
			CharacterSet="0"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="..\win32;..\;..\utility"
				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				MinimalRebuild="true"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLibrarianTool"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="VCRelease|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="4"
			CharacterSet="0"
			WholeProgramOptimization="1"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories="..\win32;..\;..\utility"
				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				RuntimeLibrary="2"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="3"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLibrarianTool"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="agentaspect"
			>
			<File
				RelativePath=".\agentaspect\agentaspect.cpp"
				>
			</File>
			<File
				RelativePath=".\agentaspect\agentaspect.h"
				>
			</File>
			<File
				RelativePath=".\agentaspect\agentaspect_c.cpp"
				>
			</File>
			<File
				RelativePath=".\agentaspect\createaction.h"
				>
			</File>
			<File
				RelativePath=".\agentaspect\effector.cpp"
				>
			</File>
			<File
				RelativePath=".\agentaspect\effector.h"
				>
			</File>
			<File
				RelativePath=".\agentaspect\effector_c.cpp"
				>
			</File>
			<File
				RelativePath=".\agentaspect\perceptor.cpp"
				>
			</File>
			<File
				RelativePath=".\agentaspect\perceptor.h"
				>
			</File>
			<File
				RelativePath=".\agentaspect\perceptor_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="controlaspect"
			>
			<File
				RelativePath=".\controlaspect\controlaspect.cpp"
				>
			</File>
			<File
				RelativePath=".\controlaspect\controlaspect.h"
				>
			</File>
			<File
				RelativePath=".\controlaspect\controlaspect_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="gamecontrolserver"
			>
			<File
				RelativePath=".\gamecontrolserver\actionobject.h"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\actionobject_c.cpp"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\baseparser.h"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\baseparser_c.cpp"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\gamecontrolserver.cpp"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\gamecontrolserver.h"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\gamecontrolserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\predicate.cpp"
				>
			</File>
			<File
				RelativePath=".\gamecontrolserver\predicate.h"
				>
			</File>
		</Filter>
		<Filter
			Name="geometryserver"
			>
			<File
				RelativePath=".\geometryserver\geometryserver.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\geometryserver.h"
				>
			</File>
			<File
				RelativePath=".\geometryserver\geometryserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\indexbuffer.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\indexbuffer.h"
				>
			</File>
			<File
				RelativePath=".\geometryserver\meshimporter.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\meshimporter.h"
				>
			</File>
			<File
				RelativePath=".\geometryserver\meshimporter_c.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\stdmeshimporter.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\stdmeshimporter.h"
				>
			</File>
			<File
				RelativePath=".\geometryserver\stdmeshimporter_c.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\trimesh.cpp"
				>
			</File>
			<File
				RelativePath=".\geometryserver\trimesh.h"
				>
			</File>
		</Filter>
		<Filter
			Name="monitorserver"
			>
			<File
				RelativePath=".\monitorserver\custommonitor.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\custommonitor.h"
				>
			</File>
			<File
				RelativePath=".\monitorserver\custommonitor_c.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorcmdparser.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorcmdparser.h"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorcmdparser_c.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitoritem.h"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitoritem_c.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorserver.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorserver.h"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorsystem.cpp"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorsystem.h"
				>
			</File>
			<File
				RelativePath=".\monitorserver\monitorsystem_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="physicsserver"
			>
			<File
				RelativePath=".\physicsserver\angularmotor.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\angularmotor.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\angularmotor_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\balljoint.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\balljoint.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\balljoint_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\body.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\body.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\body_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\bodycontroller.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\bodycontroller.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\bodycontroller_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\boxcollider.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\boxcollider.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\boxcollider_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\ccylindercollider.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\ccylindercollider.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\ccylindercollider_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\collider.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\collider.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\collider_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\collisionhandler.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\collisionhandler.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\collisionhandler_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\contactjointhandler.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\contactjointhandler.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\contactjointhandler_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\dragcontroller.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\dragcontroller.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\dragcontroller_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\fixedjoint.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\fixedjoint.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\fixedjoint_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\hinge2joint.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\hinge2joint.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\hinge2joint_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\hingejoint.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\hingejoint.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\hingejoint_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\joint.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\joint.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\joint_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\odeobject.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\odeobject.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\odeobject_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\odewrapper.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\physicsserver.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\physicsserver.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\physicsserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\planecollider.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\planecollider.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\planecollider_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\raycollider.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\raycollider.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\raycollider_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\recorderhandler.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\recorderhandler.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\recorderhandler_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\sliderjoint.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\sliderjoint.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\sliderjoint_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\space.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\space.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\space_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\spherecollider.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\spherecollider.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\spherecollider_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\transformcollider.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\transformcollider.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\transformcollider_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\universaljoint.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\universaljoint.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\universaljoint_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\velocitycontroller.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\velocitycontroller.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\velocitycontroller_c.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\world.cpp"
				>
			</File>
			<File
				RelativePath=".\physicsserver\world.h"
				>
			</File>
			<File
				RelativePath=".\physicsserver\world_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="sceneserver"
			>
			<File
				RelativePath=".\sceneserver\basenode.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\basenode.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\basenode_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\camera.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\camera.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\camera_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\fpscontroller.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\fpscontroller.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\fpscontroller_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\scene.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\scene.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\scene_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sceneimporter.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sceneimporter_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sceneserver.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sceneserver.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sceneserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\transform.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\transform.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\transform_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="simulationserver"
			>
			<File
				RelativePath=".\simulationserver\agentcontrol.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\agentcontrol.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\agentcontrol_c.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\monitorcontrol.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\monitorcontrol.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\monitorcontrol_c.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netbuffer.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netbuffer.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netclient.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netclient.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netclient_c.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netcontrol.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netcontrol.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netcontrol_c.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netmessage.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netmessage.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\netmessage_c.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\simcontrolnode.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\simcontrolnode.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\simcontrolnode_c.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\simulationserver.cpp"
				>
			</File>
			<File
				RelativePath=".\simulationserver\simulationserver.h"
				>
			</File>
			<File
				RelativePath=".\simulationserver\simulationserver_c.cpp"
				>
			</File>
		</Filter>
		<File
			RelativePath=".\oxygen.cpp"
			>
		</File>
		<File
			RelativePath=".\oxygen.h"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>