From c5933f0c84c9bef002add7a9049595fbe5d4bb39 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Wed, 3 Oct 2012 04:31:12 +0000 Subject: [PATCH] - fix android native bullet build with bullet 2.80 git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9823 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/bullet-native/android/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/src/bullet-native/android/Android.mk b/engine/src/bullet-native/android/Android.mk index 3db035184..1f7fd0a1e 100644 --- a/engine/src/bullet-native/android/Android.mk +++ b/engine/src/bullet-native/android/Android.mk @@ -230,8 +230,6 @@ LOCAL_SRC_FILES := $(JME3_PATH)/com_jme3_bullet_collision_PhysicsCollisionEvent. $(BULLET_PATH)/BulletMultiThreaded/SpuLibspe2Support.cpp\ $(BULLET_PATH)/BulletMultiThreaded/SpuSampleTaskProcess.cpp\ $(BULLET_PATH)/BulletMultiThreaded/Win32ThreadSupport.cpp\ - $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolver_CPU.cpp\ - $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/MiniCLTaskWrap.cpp\ $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp\ $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp\ $(BULLET_PATH)/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp\ @@ -255,5 +253,7 @@ LOCAL_SRC_FILES := $(JME3_PATH)/com_jme3_bullet_collision_PhysicsCollisionEvent. $(BULLET_PATH)/MiniCL/MiniCL.cpp\ $(BULLET_PATH)/MiniCL/MiniCLTaskScheduler.cpp\ $(BULLET_PATH)/MiniCL/MiniCLTask/MiniCLTask.cpp +# $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolver_CPU.cpp\ +# $(BULLET_PATH)/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/MiniCLTaskWrap.cpp\ include $(BUILD_SHARED_LIBRARY)