sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update android bullet native, mk files and gradle adding header generation dependency

Browse Source
This commit is contained in:
joliver82 2018-11-14 16:43:27 +01:00 committed by Stephen Gold
parent 07c0df7f1d
commit f19ad06820
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -16,7 +16,7 @@ buildAndroidExamples = false
# Path to android NDK for building native libraries # Path to android NDK for building native libraries
#ndkPath=/Users/normenhansen/Documents/Code-Import/android-ndk-r7 #ndkPath=/Users/normenhansen/Documents/Code-Import/android-ndk-r7
ndkPath = /opt/android-ndk-r10c ndkPath = /opt/android-ndk-r16b
# Path for downloading native Bullet # Path for downloading native Bullet
bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.86.1.zip bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.86.1.zip

3
jme3-bullet-native-android/build.gradle
View File

@ -104,7 +104,8 @@ task copyJmeAndroid(type: Copy) {
into outputDir into outputDir
} }
task buildBulletNativeLib(type: Exec, dependsOn: [copyJmeAndroid, copyJmeCpp, copyBullet]) { //dependsOn ':jme3-bullet:generateNativeHeaders'
task buildBulletNativeLib(type: Exec, dependsOn: [copyJmeAndroid, ':jme3-bullet:generateNativeHeaders', copyJmeCpp, copyBullet]) {
// args 'TARGET_PLATFORM=android-9' // args 'TARGET_PLATFORM=android-9'
// println "buildBulletNativeLib ndkWorkingPath: " + ndkWorkingPath // println "buildBulletNativeLib ndkWorkingPath: " + ndkWorkingPath
// println "buildBulletNativeLib rootProject.ndkCommandPath: " + rootProject.ndkCommandPath // println "buildBulletNativeLib rootProject.ndkCommandPath: " + rootProject.ndkCommandPath

11
jme3-bullet-native-android/src/native/android/Android.mk
View File

@ -54,12 +54,23 @@ LOCAL_C_INCLUDES := $(BULLET_PATH)/\
$(BULLET_PATH)/vectormath/sse\ $(BULLET_PATH)/vectormath/sse\
$(BULLET_PATH)/vectormath/neon $(BULLET_PATH)/vectormath/neon
#ARM mode more performant than thumb for old armeabi
ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi))
LOCAL_ARM_MODE := arm
endif
#Enable neon for armv7
ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi-v7a))
LOCAL_ARM_NEON := true
endif
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl -lm -llog LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl -lm -llog
FILE_LIST := $(wildcard $(LOCAL_PATH)/*.cpp) FILE_LIST := $(wildcard $(LOCAL_PATH)/*.cpp)
FILE_LIST += $(wildcard $(LOCAL_PATH)/**/*.cpp) FILE_LIST += $(wildcard $(LOCAL_PATH)/**/*.cpp)
FILE_LIST += $(wildcard $(LOCAL_PATH)/**/**/*.cpp) FILE_LIST += $(wildcard $(LOCAL_PATH)/**/**/*.cpp)
FILE_LIST := $(filter-out $(wildcard $(LOCAL_PATH)/Bullet3OpenCL/**/*.cpp), $(FILE_LIST))
LOCAL_SRC_FILES := $(FILE_LIST:$(LOCAL_PATH)/%=%) LOCAL_SRC_FILES := $(FILE_LIST:$(LOCAL_PATH)/%=%)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

5
jme3-bullet-native-android/src/native/android/Application.mk
View File

@ -1,4 +1,7 @@
APP_OPTIM := release APP_OPTIM := release
APP_ABI := all APP_ABI := all
#APP_ABI := armeabi-v7a APP_STL := stlport_static
# gnustl_static or stlport_static
APP_MODULES := bulletjme APP_MODULES := bulletjme
APP_CFLAGS += -funroll-loops -Ofast