From aa96a1caf8c8ab88902750348d30eee5b967f2ad Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sat, 22 Oct 2011 00:42:17 +0000 Subject: [PATCH] - commit possible fix for windows 64 pointer casting issues, see http://msdn.microsoft.com/en-us/library/aa384242(v=vs.85).aspx git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8487 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.cpp | 2 +- ...com_jme3_bullet_collision_shapes_BoxCollisionShape.cpp | 2 +- ...jme3_bullet_collision_shapes_CapsuleCollisionShape.cpp | 2 +- ...me3_bullet_collision_shapes_CompoundCollisionShape.cpp | 2 +- ...om_jme3_bullet_collision_shapes_ConeCollisionShape.cpp | 2 +- ...me3_bullet_collision_shapes_CylinderCollisionShape.cpp | 2 +- ...jme3_bullet_collision_shapes_GImpactCollisionShape.cpp | 2 +- ..._bullet_collision_shapes_HeightfieldCollisionShape.cpp | 2 +- ...om_jme3_bullet_collision_shapes_HullCollisionShape.cpp | 2 +- ...om_jme3_bullet_collision_shapes_MeshCollisionShape.cpp | 2 +- ...m_jme3_bullet_collision_shapes_PlaneCollisionShape.cpp | 2 +- ...jme3_bullet_collision_shapes_SimplexCollisionShape.cpp | 8 ++++---- ..._jme3_bullet_collision_shapes_SphereCollisionShape.cpp | 2 +- .../bullet/native/com_jme3_bullet_joints_ConeJoint.cpp | 2 +- .../bullet/native/com_jme3_bullet_joints_HingeJoint.cpp | 2 +- .../native/com_jme3_bullet_joints_Point2PointJoint.cpp | 2 +- .../bullet/native/com_jme3_bullet_joints_SixDofJoint.cpp | 6 +++--- .../native/com_jme3_bullet_joints_SixDofSpringJoint.cpp | 2 +- .../bullet/native/com_jme3_bullet_joints_SliderJoint.cpp | 2 +- .../native/com_jme3_bullet_objects_PhysicsCharacter.cpp | 4 ++-- .../native/com_jme3_bullet_objects_PhysicsGhostObject.cpp | 2 +- .../native/com_jme3_bullet_objects_PhysicsRigidBody.cpp | 4 ++-- .../native/com_jme3_bullet_objects_PhysicsVehicle.cpp | 4 ++-- ...com_jme3_bullet_objects_infos_RigidBodyMotionState.cpp | 2 +- .../bullet/native/com_jme3_bullet_util_NativeMeshUtil.cpp | 2 +- engine/src/bullet/native/jmeBulletUtil.h | 8 ++++++++ 26 files changed, 41 insertions(+), 33 deletions(-) diff --git a/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.cpp b/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.cpp index 01c438193..9606cf9c0 100644 --- a/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.cpp @@ -55,7 +55,7 @@ extern "C" { return 0; } space->createPhysicsSpace(minX, minY, minZ, maxX, maxY, maxZ, broadphase, threading); - return (long) space; + return (OBJ_PTR) space; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_BoxCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_BoxCollisionShape.cpp index 1c34c0a91..00f6e98ca 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_BoxCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_BoxCollisionShape.cpp @@ -51,7 +51,7 @@ extern "C" { btVector3 extents = btVector3(); jmeBulletUtil::convert(env, halfExtents, &extents); btBoxShape* shape = new btBoxShape(extents); - return (long)shape; + return (OBJ_PTR)shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CapsuleCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CapsuleCollisionShape.cpp index 7d963dfc3..79bb98194 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CapsuleCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CapsuleCollisionShape.cpp @@ -60,7 +60,7 @@ extern "C" { shape = new btCapsuleShapeZ(radius, height); break; } - return (long) shape; + return (OBJ_PTR) shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CompoundCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CompoundCollisionShape.cpp index a196c2cc0..469de6334 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CompoundCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CompoundCollisionShape.cpp @@ -49,7 +49,7 @@ extern "C" { (JNIEnv *env, jobject object) { jmeClasses::initJavaClasses(env); btCompoundShape* shape = new btCompoundShape(); - return (long) shape; + return (OBJ_PTR) shape; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_ConeCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_ConeCollisionShape.cpp index a3bf7c254..b73c5a925 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_ConeCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_ConeCollisionShape.cpp @@ -60,7 +60,7 @@ extern "C" { shape = new btConeShapeZ(radius, height); break; } - return (long) shape; + return (OBJ_PTR) shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CylinderCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CylinderCollisionShape.cpp index 4fdaab694..b069b6c23 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CylinderCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_CylinderCollisionShape.cpp @@ -62,7 +62,7 @@ extern "C" { shape = new btCylinderShapeZ(extents); break; } - return (long) shape; + return (OBJ_PTR) shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_GImpactCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_GImpactCollisionShape.cpp index 6322a42b9..44e304a6f 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_GImpactCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_GImpactCollisionShape.cpp @@ -51,7 +51,7 @@ extern "C" { jmeClasses::initJavaClasses(env); btTriangleIndexVertexArray* array = (btTriangleIndexVertexArray*) meshId; btGImpactMeshShape* shape = new btGImpactMeshShape(array); - return (long) shape; + return (OBJ_PTR) shape; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HeightfieldCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HeightfieldCollisionShape.cpp index 6dad6f9ba..9564ea0fb 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HeightfieldCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HeightfieldCollisionShape.cpp @@ -51,7 +51,7 @@ extern "C" { jmeClasses::initJavaClasses(env); void* data = env->GetDirectBufferAddress(heightfieldData); btHeightfieldTerrainShape* shape=new btHeightfieldTerrainShape(heightStickWidth, heightStickLength, data, heightScale, minHeight, maxHeight, upAxis, PHY_FLOAT, flipQuadEdges); - return (long)shape; + return (OBJ_PTR)shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HullCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HullCollisionShape.cpp index 797662a8b..3a8e735aa 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HullCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_HullCollisionShape.cpp @@ -61,7 +61,7 @@ extern "C" { shape->addPoint(vect); } - return (long) shape; + return (OBJ_PTR) shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_MeshCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_MeshCollisionShape.cpp index 624effc22..542e97c7b 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_MeshCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_MeshCollisionShape.cpp @@ -51,7 +51,7 @@ extern "C" { jmeClasses::initJavaClasses(env); btTriangleIndexVertexArray* array = (btTriangleIndexVertexArray*) arrayId; btBvhTriangleMeshShape* shape = new btBvhTriangleMeshShape(array, true, true); - return (long) shape; + return (OBJ_PTR) shape; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_PlaneCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_PlaneCollisionShape.cpp index ad25da2cc..85cb8e35a 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_PlaneCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_PlaneCollisionShape.cpp @@ -52,7 +52,7 @@ extern "C" { btVector3 norm = btVector3(); jmeBulletUtil::convert(env, normal, &norm); btStaticPlaneShape* shape = new btStaticPlaneShape(norm, constant); - return (long)shape; + return (OBJ_PTR)shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SimplexCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SimplexCollisionShape.cpp index 368cf5870..73f8467e9 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SimplexCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SimplexCollisionShape.cpp @@ -51,7 +51,7 @@ extern "C" { btVector3 vec1 = btVector3(); jmeBulletUtil::convert(env, vector1, &vec1); btBU_Simplex1to4* simplexShape = new btBU_Simplex1to4(vec1); - return (long) simplexShape; + return (OBJ_PTR) simplexShape; } /* @@ -67,7 +67,7 @@ extern "C" { btVector3 vec2 = btVector3(); jmeBulletUtil::convert(env, vector2, &vec2); btBU_Simplex1to4* simplexShape = new btBU_Simplex1to4(vec1, vec2); - return (long) simplexShape; + return (OBJ_PTR) simplexShape; } /* * Class: com_jme3_bullet_collision_shapes_SimplexCollisionShape @@ -84,7 +84,7 @@ extern "C" { btVector3 vec3 = btVector3(); jmeBulletUtil::convert(env, vector3, &vec3); btBU_Simplex1to4* simplexShape = new btBU_Simplex1to4(vec1, vec2, vec3); - return (long) simplexShape; + return (OBJ_PTR) simplexShape; } /* * Class: com_jme3_bullet_collision_shapes_SimplexCollisionShape @@ -103,7 +103,7 @@ extern "C" { btVector3 vec4 = btVector3(); jmeBulletUtil::convert(env, vector4, &vec4); btBU_Simplex1to4* simplexShape = new btBU_Simplex1to4(vec1, vec2, vec3, vec4); - return (long) simplexShape; + return (OBJ_PTR) simplexShape; } #ifdef __cplusplus } diff --git a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SphereCollisionShape.cpp b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SphereCollisionShape.cpp index d1805d632..abe117a56 100644 --- a/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SphereCollisionShape.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_collision_shapes_SphereCollisionShape.cpp @@ -49,7 +49,7 @@ extern "C" { (JNIEnv *env, jobject object, jfloat radius) { jmeClasses::initJavaClasses(env); btSphereShape* shape=new btSphereShape(radius); - return (long)shape; + return (OBJ_PTR)shape; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_joints_ConeJoint.cpp b/engine/src/bullet/native/com_jme3_bullet_joints_ConeJoint.cpp index 5b9caa4d9..8af360924 100644 --- a/engine/src/bullet/native/com_jme3_bullet_joints_ConeJoint.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_joints_ConeJoint.cpp @@ -92,7 +92,7 @@ extern "C" { jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); jmeBulletUtil::convert(env, rotB, &transB.getBasis()); btConeTwistConstraint* joint = new btConeTwistConstraint(*bodyA, *bodyB, transA, transB); - return (long) joint; + return (OBJ_PTR) joint; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_joints_HingeJoint.cpp b/engine/src/bullet/native/com_jme3_bullet_joints_HingeJoint.cpp index 984aeefb3..4996af856 100644 --- a/engine/src/bullet/native/com_jme3_bullet_joints_HingeJoint.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_joints_HingeJoint.cpp @@ -219,7 +219,7 @@ extern "C" { jmeBulletUtil::convert(env, axisA, &vec3); jmeBulletUtil::convert(env, axisB, &vec4); btHingeConstraint* joint = new btHingeConstraint(*bodyA, *bodyB, vec1, vec2, vec3, vec4); - return (long) joint; + return (OBJ_PTR) joint; } #ifdef __cplusplus } diff --git a/engine/src/bullet/native/com_jme3_bullet_joints_Point2PointJoint.cpp b/engine/src/bullet/native/com_jme3_bullet_joints_Point2PointJoint.cpp index 35a9f3791..b5955c778 100644 --- a/engine/src/bullet/native/com_jme3_bullet_joints_Point2PointJoint.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_joints_Point2PointJoint.cpp @@ -154,7 +154,7 @@ extern "C" { btTransform transB = btTransform(mtx2); jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); btHingeConstraint* joint = new btHingeConstraint(*bodyA, *bodyB, transA, transB); - return (long) joint; + return (OBJ_PTR) joint; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_joints_SixDofJoint.cpp b/engine/src/bullet/native/com_jme3_bullet_joints_SixDofJoint.cpp index 65e5924ee..54b190698 100644 --- a/engine/src/bullet/native/com_jme3_bullet_joints_SixDofJoint.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_joints_SixDofJoint.cpp @@ -53,7 +53,7 @@ extern "C" { env->ThrowNew(newExc, "The native object does not exist."); return 0; } - return (long) joint->getRotationalLimitMotor(index); + return (OBJ_PTR) joint->getRotationalLimitMotor(index); } /* @@ -69,7 +69,7 @@ extern "C" { env->ThrowNew(newExc, "The native object does not exist."); return 0; } - return (long) joint->getTranslationalLimitMotor(); + return (OBJ_PTR) joint->getTranslationalLimitMotor(); } /* @@ -163,7 +163,7 @@ extern "C" { jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); jmeBulletUtil::convert(env, rotB, &transB.getBasis()); btGeneric6DofConstraint* joint = new btGeneric6DofConstraint(*bodyA, *bodyB, transA, transB, useLinearReferenceFrameA); - return (long) joint; + return (OBJ_PTR) joint; } #ifdef __cplusplus } diff --git a/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp b/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp index 391b06b93..a1513db7c 100644 --- a/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp @@ -86,7 +86,7 @@ JNIEXPORT jlong JNICALL Java_com_jme3_bullet_joints_SixDofSpringJoint_createJoin jmeBulletUtil::convert(env, rotB, &transB.getBasis()); btGeneric6DofSpringConstraint* joint = new btGeneric6DofSpringConstraint(*bodyA, *bodyB, transA, transB, useLinearReferenceFrameA); - return (long)joint; + return (OBJ_PTR)joint; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_joints_SliderJoint.cpp b/engine/src/bullet/native/com_jme3_bullet_joints_SliderJoint.cpp index d59760cfc..6adc2cd9c 100644 --- a/engine/src/bullet/native/com_jme3_bullet_joints_SliderJoint.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_joints_SliderJoint.cpp @@ -955,7 +955,7 @@ extern "C" { jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); jmeBulletUtil::convert(env, rotB, &transB.getBasis()); btSliderConstraint* joint = new btSliderConstraint(*bodyA, *bodyB, transA, transB, useLinearReferenceFrameA); - return (long) joint; + return (OBJ_PTR) joint; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsCharacter.cpp b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsCharacter.cpp index b8d3afa00..b3cf14295 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsCharacter.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsCharacter.cpp @@ -52,7 +52,7 @@ extern "C" { (JNIEnv * env, jobject object) { jmeClasses::initJavaClasses(env); btPairCachingGhostObject* ghost = new btPairCachingGhostObject(); - return (long) ghost; + return (OBJ_PTR) ghost; } /* @@ -88,7 +88,7 @@ extern "C" { //TODO: check convexshape! btConvexShape* shape = (btConvexShape*) shapeId; btKinematicCharacterController* character = new btKinematicCharacterController(ghost, shape, stepHeight); - return (long) character; + return (OBJ_PTR) character; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsGhostObject.cpp b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsGhostObject.cpp index e5bd4a394..695abccff 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsGhostObject.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsGhostObject.cpp @@ -54,7 +54,7 @@ extern "C" { (JNIEnv * env, jobject object) { jmeClasses::initJavaClasses(env); btPairCachingGhostObject* ghost = new btPairCachingGhostObject(); - return (long) ghost; + return (OBJ_PTR) ghost; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp index 0ee79271f..08d12ce76 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp @@ -55,7 +55,7 @@ extern "C" { shape->calculateLocalInertia(mass, localInertia); btRigidBody* body = new btRigidBody(mass, motionState, shape, localInertia); body->setUserPointer(NULL); - return (long) body; + return (OBJ_PTR) body; } /* @@ -336,7 +336,7 @@ extern "C" { btVector3 localInertia = btVector3(); shape->calculateLocalInertia(mass, localInertia); body->setMassProps(mass, localInertia); - return (long) body; + return (OBJ_PTR) body; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp index 4cb38c19d..56f7a25fe 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp @@ -75,7 +75,7 @@ extern "C" { return 0; } btDefaultVehicleRaycaster* caster = new btDefaultVehicleRaycaster(space->getDynamicsWorld()); - return (long) caster; + return (OBJ_PTR) caster; } /* @@ -101,7 +101,7 @@ extern "C" { } btRaycastVehicle::btVehicleTuning tuning; btRaycastVehicle* vehicle = new btRaycastVehicle(tuning, body, caster); - return (long) vehicle; + return (OBJ_PTR) vehicle; } diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_infos_RigidBodyMotionState.cpp b/engine/src/bullet/native/com_jme3_bullet_objects_infos_RigidBodyMotionState.cpp index 567bdf348..4da1af25b 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_infos_RigidBodyMotionState.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_objects_infos_RigidBodyMotionState.cpp @@ -50,7 +50,7 @@ extern "C" { (JNIEnv *env, jobject object) { jmeClasses::initJavaClasses(env); jmeMotionState* motionState = new jmeMotionState(); - return (long) motionState; + return (OBJ_PTR) motionState; } /* diff --git a/engine/src/bullet/native/com_jme3_bullet_util_NativeMeshUtil.cpp b/engine/src/bullet/native/com_jme3_bullet_util_NativeMeshUtil.cpp index 46311422c..45d9b1725 100644 --- a/engine/src/bullet/native/com_jme3_bullet_util_NativeMeshUtil.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_util_NativeMeshUtil.cpp @@ -51,7 +51,7 @@ extern "C" { int* triangles = (int*) env->GetDirectBufferAddress(triangleIndexBase); float* vertices = (float*) env->GetDirectBufferAddress(vertexIndexBase); btTriangleIndexVertexArray* array = new btTriangleIndexVertexArray(numTriangles, triangles, triangleIndexStride, numVertices, vertices, vertexStride); - return (long) array; + return (OBJ_PTR) array; } #ifdef __cplusplus diff --git a/engine/src/bullet/native/jmeBulletUtil.h b/engine/src/bullet/native/jmeBulletUtil.h index d231bba73..d698f7925 100644 --- a/engine/src/bullet/native/jmeBulletUtil.h +++ b/engine/src/bullet/native/jmeBulletUtil.h @@ -34,6 +34,14 @@ #include "btBulletCollisionCommon.h" #include "LinearMath/btVector3.h" +#ifdef _WIN32 +typedef ULONG OBJ_PTR; +#elif _WIN64 +typedef _int64 OBJ_PTR; +#else +typedef long OBJ_PTR; +#endif + /** * Author: Normen Hansen */