From a291d84b2b4cc8930901ea17b6c6042e25ca02ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 20 Jan 2022 01:11:41 +0100 Subject: [PATCH] Havok: Move hkpConstraintInstance to the correct folder --- lib/hkStubs/CMakeLists.txt | 2 +- .../Dynamics}/Constraint/hkpConstraintInstance.h | 0 src/KingSystem/Physics/RigidBody/physRigidBody.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/hkStubs/Havok/{Physics => Physics2012/Dynamics}/Constraint/hkpConstraintInstance.h (100%) diff --git a/lib/hkStubs/CMakeLists.txt b/lib/hkStubs/CMakeLists.txt index 41100b10..613502a6 100644 --- a/lib/hkStubs/CMakeLists.txt +++ b/lib/hkStubs/CMakeLists.txt @@ -67,7 +67,6 @@ add_library(hkStubs OBJECT Havok/Geometry/Collide/Shapes/hkcdShape.h - Havok/Physics/Constraint/hkpConstraintInstance.h Havok/Physics/Constraint/Atom/hkpConstraintAtom.h Havok/Physics/Constraint/Data/hkpConstraintData.h Havok/Physics/Constraint/Data/hkpConstraintInfo.h @@ -107,6 +106,7 @@ add_library(hkStubs OBJECT Havok/Physics2012/Dynamics/Collide/hkpResponseModifier.h Havok/Physics2012/Dynamics/Common/hkpMaterial.h Havok/Physics2012/Dynamics/Common/hkpProperty.h + Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h Havok/Physics2012/Dynamics/Entity/hkpEntity.h Havok/Physics2012/Dynamics/Entity/hkpRigidBody.h Havok/Physics2012/Dynamics/Entity/hkpRigidBodyCinfo.h diff --git a/lib/hkStubs/Havok/Physics/Constraint/hkpConstraintInstance.h b/lib/hkStubs/Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h similarity index 100% rename from lib/hkStubs/Havok/Physics/Constraint/hkpConstraintInstance.h rename to lib/hkStubs/Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp index 585c5b85..4dad0822 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp +++ b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp @@ -1,8 +1,8 @@ #include "KingSystem/Physics/RigidBody/physRigidBody.h" #include #include -#include #include +#include #include #include #include