From 3dfe94f84b69ac26be78dd205eced64f60b3e3ca Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sat, 15 Oct 2011 21:21:02 +0000 Subject: [PATCH] - bullet native: add fix for android compilation of native git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8402 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/bullet/native/jmePhysicsSpace.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/src/bullet/native/jmePhysicsSpace.cpp b/engine/src/bullet/native/jmePhysicsSpace.cpp index 634f7f379..e3e566d4c 100644 --- a/engine/src/bullet/native/jmePhysicsSpace.cpp +++ b/engine/src/bullet/native/jmePhysicsSpace.cpp @@ -49,7 +49,11 @@ jmePhysicsSpace::jmePhysicsSpace(JNIEnv* env, jobject javaSpace) { } void jmePhysicsSpace::attachThread() { - vm->AttachCurrentThread((void **) &env, NULL); +#ifdef JNI_VERSION_1_2 + vm->AttachCurrentThread((void**) &env, NULL); +#else + vm->AttachCurrentThread(vm, &env, NULL); +#endif } JNIEnv* jmePhysicsSpace::getEnv() {