Skip to content

Commit

Permalink
xrGame: fix undefined symbol: _ZN12SPHBonesDataC1Ev
Browse files Browse the repository at this point in the history
  • Loading branch information
eagleivg committed Nov 6, 2018
1 parent e470690 commit 7500f22
Show file tree
Hide file tree
Showing 61 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion src/xrPhysics/ActorCameraCollision.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "ActorCameraCollision.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/DisablingParams.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "DisablingParams.h"

SAllDDWParams worldDisablingParams = {
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/ElevatorState.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "ElevatorState.h"
#include "IClimableObject.h"
#include "PHCharacter.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/ExtendedGeom.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "ExtendedGeom.h"
#include "dcylinder/dCylinder.h"
bool IsCyliderContact(const dContact& c)
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/Geometry.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "Geometry.h"
#include "PHDynamicData.h"
#include "ExtendedGeom.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/GeometryBits.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "GeometryBits.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/IActivationShape.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "IActivationShape.h"
#include "PHActivationShape.h"
#include "Physics.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/MathUtils.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "MathUtils.h"
#include "xrCore/_cylinder.h"
#include <ode/common.h>
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/MovementBoxDynamicActivate.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "MovementBoxDynamicActivate.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHAICharacter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "PHDynamicData.h"
#include "Physics.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHActivationShape.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHActivationShape.h"

#include "Physics.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHActorCharacter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHActorCharacter.h"
#include "ExtendedGeom.h"
#include "PhysicsCommon.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHCapture.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "StdAfx.h"

#include "PHCapture.h"
#include "PHCharacter.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHCaptureInit.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "StdAfx.h"
#include "PHCharacter.h"
#include "Physics.h"
#include "ExtendedGeom.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHCharacter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "PHCharacter.h"
#include "PHDynamicData.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHCollideValidator.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHObject.h"
#include "PHCollideValidator.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHContactBodyEffector.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHContactBodyEffector.h"
#include "ExtendedGeom.h"
#include "tri-colliderknoopc/dTriList.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHDisabling.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHDisabling.h"
#include "PhysicsCommon.h"
#include "Physics.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHDynamicData.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// PHDynamicData.cpp: implementation of the PHDynamicData class.
//
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "StdAfx.h"
#include "PHDynamicData.h"

//////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHElement.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderknoopc/dTriList.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHElementNetState.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PhysicsShell.h"
#include "PHInterpolation.h"
#include "PHElement.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHFracture.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHFracture.h"
#include "Physics.h"
#include "PHElement.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHGeometryOwner.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHGeometryOwner.h"
#include "PHWorld.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHInterpolation.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHInterpolation.h"
#include "PHDynamicData.h"
#include "Physics.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHIsland.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHIsland.h"
#include "Physics.h"
#include "ph_valid_ode.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHJoint.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderknoopc/dTriList.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHJointDestroyInfo.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHJointDestroyInfo.h"
#include "PhysicsCommon.h"
#include "MathUtilsOde.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHMoveStorage.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHMoveStorage.h"
#pragma warning(push)
#pragma warning(disable : 4995)
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHObject.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "Physics.h"
#include "PHObject.h"
#include "PHWorld.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHShell.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "StdAfx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderknoopc/dTriList.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHShellActivate.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderknoopc/dTriList.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHShellNetState.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PhysicsShell.h"
#include "PHInterpolation.h"
#include "PHObject.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHShellSplitter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "Physics.h"
#include "PHShell.h"
#include "PHShellSplitter.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHSimpleCharacter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "PHDynamicData.h"
#include "ExtendedGeom.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHSplitedShell.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PhysicsShell.h"
#include "PHObject.h"
#include "PHWorld.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHStaticGeomShell.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHStaticGeomShell.h"
#include "SpaceUtils.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHWorld.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "PHWorld.h"
#include "tri-colliderknoopc/dTriList.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/Physics.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include <limits>

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PhysicsExternalCommon.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PhysicsExternalCommon.h"
#include "ExtendedGeom.h"
#include "MathUtilsOde.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PhysicsShell.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#pragma hdrstop
#include "PhysicsShell.h"
#include "PHDynamicData.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PhysicsShellAnimator.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PhysicsShellAnimator.h"
#include "PhysicsShellAnimatorBoneData.h"
#include "Include/xrRender/KinematicsAnimated.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/ShellHit.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderknoopc/dTriList.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/xrPhysics/collisiondamagereceiver.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "icollisiondamagereceiver.h"
#include "IPhysicsShellHolder.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/console_vars.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "console_vars.h"

#include "PhysicsCommon.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/dRayMotions.cpp
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/dcylinder/dCylinder.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include <xrPhysics/tri-colliderknoopc/dTriColliderCommon.h>
#include "dCylinder.h"
#include "xrPhysics/ode_include.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/debug_output.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "debug_output.h"
#ifdef DEBUG

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/params.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/phvalide.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "phvalide.h"
#include "MathUtils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/physics_scripted.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"

#include "physics_scripted.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/stdafx.cpp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#include "stdafx.h"
#include "StdAfx.h"
2 changes: 1 addition & 1 deletion src/xrPhysics/tri-colliderknoopc/dSortTriPrimitive.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#include "stdafx.h"
#include "StdAfx.h"
//#include "dSortTriPrimitive.h"

2 changes: 1 addition & 1 deletion src/xrPhysics/tri-colliderknoopc/dTriBox.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "dTriColliderCommon.h"
#include "dTriBox.h"
#include "dcTriListCollider.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/tri-colliderknoopc/dTriCallideK.cpp
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "dTriCollideK.h"
2 changes: 1 addition & 1 deletion src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "dTriColliderCommon.h"
#include "xrPhysics/dcylinder/dCylinder.h"
#include "dTriCylinder.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/tri-colliderknoopc/dTriList.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "dTriCollideK.h"
#include "dxTriList.h"
#include "dcTriListCollider.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#include "dTriColliderCommon.h"
#include "dTriColliderMath.h"
#include "dTriSphere.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/xrPhysics.cpp
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/xrServerEntities/PHNetState.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "StdAfx.h"
#pragma hdrstop

#include "PHNetState.h"
Expand Down

0 comments on commit 7500f22

Please sign in to comment.