xrGame: fix undefined symbol: _ZN12SPHBonesDataC1Ev

eagleivg · eagleivg · commit 7500f222af43 · 2018-11-06T13:27:07.000+03:00
diff --git a/src/xrPhysics/ActorCameraCollision.cpp b/src/xrPhysics/ActorCameraCollision.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "ActorCameraCollision.h"
 
diff --git a/src/xrPhysics/CMakeLists.txt b/src/xrPhysics/CMakeLists.txt
@@ -24,7 +24,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colli
 add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
-set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h")
+set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "StdAfx.h")
 cotire(${PROJECT_NAME})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
diff --git a/src/xrPhysics/DisablingParams.cpp b/src/xrPhysics/DisablingParams.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "DisablingParams.h"
 
 SAllDDWParams worldDisablingParams = {
diff --git a/src/xrPhysics/ElevatorState.cpp b/src/xrPhysics/ElevatorState.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "ElevatorState.h"
 #include "IClimableObject.h"
 #include "PHCharacter.h"
diff --git a/src/xrPhysics/ExtendedGeom.cpp b/src/xrPhysics/ExtendedGeom.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "ExtendedGeom.h"
 #include "dcylinder/dCylinder.h"
 bool IsCyliderContact(const dContact& c)
diff --git a/src/xrPhysics/Geometry.cpp b/src/xrPhysics/Geometry.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "Geometry.h"
 #include "PHDynamicData.h"
 #include "ExtendedGeom.h"
diff --git a/src/xrPhysics/GeometryBits.cpp b/src/xrPhysics/GeometryBits.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "GeometryBits.h"
 
diff --git a/src/xrPhysics/IActivationShape.cpp b/src/xrPhysics/IActivationShape.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "IActivationShape.h"
 #include "PHActivationShape.h"
 #include "Physics.h"
diff --git a/src/xrPhysics/MathUtils.cpp b/src/xrPhysics/MathUtils.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "MathUtils.h"
 #include "xrCore/_cylinder.h"
 #include <ode/common.h>
diff --git a/src/xrPhysics/MovementBoxDynamicActivate.cpp b/src/xrPhysics/MovementBoxDynamicActivate.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "MovementBoxDynamicActivate.h"
 
diff --git a/src/xrPhysics/PHAICharacter.cpp b/src/xrPhysics/PHAICharacter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "PHDynamicData.h"
 #include "Physics.h"
diff --git a/src/xrPhysics/PHActivationShape.cpp b/src/xrPhysics/PHActivationShape.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHActivationShape.h"
 
 #include "Physics.h"
diff --git a/src/xrPhysics/PHActorCharacter.cpp b/src/xrPhysics/PHActorCharacter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHActorCharacter.h"
 #include "ExtendedGeom.h"
 #include "PhysicsCommon.h"
diff --git a/src/xrPhysics/PHCapture.cpp b/src/xrPhysics/PHCapture.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "PHCapture.h"
 #include "PHCharacter.h"
diff --git a/src/xrPhysics/PHCaptureInit.cpp b/src/xrPhysics/PHCaptureInit.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHCharacter.h"
 #include "Physics.h"
 #include "ExtendedGeom.h"
diff --git a/src/xrPhysics/PHCharacter.cpp b/src/xrPhysics/PHCharacter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "PHCharacter.h"
 #include "PHDynamicData.h"
diff --git a/src/xrPhysics/PHCollideValidator.cpp b/src/xrPhysics/PHCollideValidator.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHObject.h"
 #include "PHCollideValidator.h"
 
diff --git a/src/xrPhysics/PHContactBodyEffector.cpp b/src/xrPhysics/PHContactBodyEffector.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHContactBodyEffector.h"
 #include "ExtendedGeom.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHDisabling.cpp b/src/xrPhysics/PHDisabling.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHDisabling.h"
 #include "PhysicsCommon.h"
 #include "Physics.h"
diff --git a/src/xrPhysics/PHDynamicData.cpp b/src/xrPhysics/PHDynamicData.cpp
@@ -1,7 +1,7 @@
 // PHDynamicData.cpp: implementation of the PHDynamicData class.
 //
 //////////////////////////////////////////////////////////////////////
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHDynamicData.h"
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/xrPhysics/PHElement.cpp b/src/xrPhysics/PHElement.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHElementNetState.cpp b/src/xrPhysics/PHElementNetState.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PhysicsShell.h"
 #include "PHInterpolation.h"
 #include "PHElement.h"
diff --git a/src/xrPhysics/PHFracture.cpp b/src/xrPhysics/PHFracture.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHFracture.h"
 #include "Physics.h"
 #include "PHElement.h"
diff --git a/src/xrPhysics/PHGeometryOwner.cpp b/src/xrPhysics/PHGeometryOwner.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHGeometryOwner.h"
 #include "PHWorld.h"
 
diff --git a/src/xrPhysics/PHInterpolation.cpp b/src/xrPhysics/PHInterpolation.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHInterpolation.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
diff --git a/src/xrPhysics/PHIsland.cpp b/src/xrPhysics/PHIsland.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHIsland.h"
 #include "Physics.h"
 #include "ph_valid_ode.h"
diff --git a/src/xrPhysics/PHJoint.cpp b/src/xrPhysics/PHJoint.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHJointDestroyInfo.cpp b/src/xrPhysics/PHJointDestroyInfo.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHJointDestroyInfo.h"
 #include "PhysicsCommon.h"
 #include "MathUtilsOde.h"
diff --git a/src/xrPhysics/PHMoveStorage.cpp b/src/xrPhysics/PHMoveStorage.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHMoveStorage.h"
 #pragma warning(push)
 #pragma warning(disable : 4995)
diff --git a/src/xrPhysics/PHObject.cpp b/src/xrPhysics/PHObject.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "Physics.h"
 #include "PHObject.h"
 #include "PHWorld.h"
diff --git a/src/xrPhysics/PHShell.cpp b/src/xrPhysics/PHShell.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHShellActivate.cpp b/src/xrPhysics/PHShellActivate.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHShellNetState.cpp b/src/xrPhysics/PHShellNetState.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PhysicsShell.h"
 #include "PHInterpolation.h"
 #include "PHObject.h"
diff --git a/src/xrPhysics/PHShellSplitter.cpp b/src/xrPhysics/PHShellSplitter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "Physics.h"
 #include "PHShell.h"
 #include "PHShellSplitter.h"
diff --git a/src/xrPhysics/PHSimpleCharacter.cpp b/src/xrPhysics/PHSimpleCharacter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "PHDynamicData.h"
 #include "ExtendedGeom.h"
diff --git a/src/xrPhysics/PHSplitedShell.cpp b/src/xrPhysics/PHSplitedShell.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PhysicsShell.h"
 #include "PHObject.h"
 #include "PHWorld.h"
diff --git a/src/xrPhysics/PHStaticGeomShell.cpp b/src/xrPhysics/PHStaticGeomShell.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHStaticGeomShell.h"
 #include "SpaceUtils.h"
 
diff --git a/src/xrPhysics/PHWorld.cpp b/src/xrPhysics/PHWorld.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "PHWorld.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/Physics.cpp b/src/xrPhysics/Physics.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include <limits>
 
diff --git a/src/xrPhysics/PhysicsExternalCommon.cpp b/src/xrPhysics/PhysicsExternalCommon.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PhysicsExternalCommon.h"
 #include "ExtendedGeom.h"
 #include "MathUtilsOde.h"
diff --git a/src/xrPhysics/PhysicsShell.cpp b/src/xrPhysics/PhysicsShell.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #pragma hdrstop
 #include "PhysicsShell.h"
 #include "PHDynamicData.h"
diff --git a/src/xrPhysics/PhysicsShellAnimator.cpp b/src/xrPhysics/PhysicsShellAnimator.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PhysicsShellAnimator.h"
 #include "PhysicsShellAnimatorBoneData.h"
 #include "Include/xrRender/KinematicsAnimated.h"
diff --git a/src/xrPhysics/ShellHit.cpp b/src/xrPhysics/ShellHit.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/StdAfx.h b/src/xrPhysics/StdAfx.h
diff --git a/src/xrPhysics/collisiondamagereceiver.cpp b/src/xrPhysics/collisiondamagereceiver.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "icollisiondamagereceiver.h"
 #include "IPhysicsShellHolder.h"
diff --git a/src/xrPhysics/console_vars.cpp b/src/xrPhysics/console_vars.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "console_vars.h"
 
 #include "PhysicsCommon.h"
diff --git a/src/xrPhysics/dRayMotions.cpp b/src/xrPhysics/dRayMotions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "dcylinder/dCylinder.h"
 struct dContactGeom;
 int dCollideCylRay(dxGeom* o1, dxGeom* o2, int flags, dContactGeom* contact, int skip);
diff --git a/src/xrPhysics/dcylinder/dCylinder.cpp b/src/xrPhysics/dcylinder/dCylinder.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include <xrPhysics/tri-colliderknoopc/dTriColliderCommon.h>
 #include "dCylinder.h"
 #include "xrPhysics/ode_include.h"
diff --git a/src/xrPhysics/debug_output.cpp b/src/xrPhysics/debug_output.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "debug_output.h"
 #ifdef DEBUG
 
diff --git a/src/xrPhysics/params.cpp b/src/xrPhysics/params.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "params.h"
 float object_damage_factor = 1.f; // times increace damage from object collision
diff --git a/src/xrPhysics/phvalide.cpp b/src/xrPhysics/phvalide.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "phvalide.h"
 #include "MathUtils.h"
diff --git a/src/xrPhysics/physics_scripted.cpp b/src/xrPhysics/physics_scripted.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "physics_scripted.h"
 
diff --git a/src/xrPhysics/stdafx.cpp b/src/xrPhysics/stdafx.cpp
@@ -1 +1 @@
-#include "stdafx.h"
+#include "StdAfx.h"
diff --git a/src/xrPhysics/tri-colliderknoopc/dSortTriPrimitive.cpp b/src/xrPhysics/tri-colliderknoopc/dSortTriPrimitive.cpp
@@ -1,3 +1,3 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 //#include "dSortTriPrimitive.h"
 
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriBox.cpp b/src/xrPhysics/tri-colliderknoopc/dTriBox.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "dTriColliderCommon.h"
 #include "dTriBox.h"
 #include "dcTriListCollider.h"
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriCallideK.cpp b/src/xrPhysics/tri-colliderknoopc/dTriCallideK.cpp
@@ -1,2 +1,2 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "dTriCollideK.h"
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "dTriColliderCommon.h"
 #include "xrPhysics/dcylinder/dCylinder.h"
 #include "dTriCylinder.h"
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriList.cpp b/src/xrPhysics/tri-colliderknoopc/dTriList.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "dTriCollideK.h"
 #include "dxTriList.h"
 #include "dcTriListCollider.h"
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp b/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "dTriColliderCommon.h"
 #include "dTriColliderMath.h"
 #include "dTriSphere.h"
diff --git a/src/xrPhysics/xrPhysics.cpp b/src/xrPhysics/xrPhysics.cpp
@@ -1,7 +1,7 @@
 // xrPhysics.cpp : Defines the entry point for the DLL application.
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "xrPhysics.h"
 #include <ode/memory.h>
 
diff --git a/src/xrServerEntities/PHNetState.cpp b/src/xrServerEntities/PHNetState.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdAfx.h"
 #pragma hdrstop
 
 #include "PHNetState.h"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "stdafx.h"`
	`1`	`+#include "StdAfx.h"`
`2`	`2`
`3`	`3`	`#include "ActorCameraCollision.h"`
`4`	`4`