Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
name: Build natives for android
runs-on: ubuntu-latest
container:
image: ghcr.io/cirruslabs/android-sdk:35-ndk
image: ghcr.io/cirruslabs/android-sdk:36-ndk

steps:
- name: Clone the repo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_CFLAGS := -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
LOCAL_LDLIBS := -llog -Wl,-s

LOCAL_MODULE := bufferallocatorjme
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ APP_PLATFORM := android-19
# change this to 'debug' to see android logs
APP_OPTIM := release
APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

2 changes: 1 addition & 1 deletion jme3-android-native/src/native/jme_decode/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LOCAL_C_INCLUDES:= \
$(LOCAL_PATH) \
$(LOCAL_PATH)/Tremor

LOCAL_CFLAGS := -std=gnu99 -DLIMIT_TO_64kHz -O0 -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
LOCAL_CFLAGS := -std=gnu99 -DLIMIT_TO_64kHz -O0
LOCAL_LDLIBS := -lz -llog -Wl,-s

ifeq ($(TARGET_ARCH),arm)
Expand Down
2 changes: 2 additions & 0 deletions jme3-android-native/src/native/jme_decode/Application.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
APP_PLATFORM := android-9
APP_OPTIM := release
APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

9 changes: 7 additions & 2 deletions jme3-android-native/src/native/jme_openalsoft/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ LOCAL_CFLAGS := -ffast-math \
-DAL_ALEXT_PROTOTYPES \
-fcommon \
-O0 \
-DRESTRICT="" \
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
-DRESTRICT=""

LOCAL_LDLIBS := -lOpenSLES -llog -Wl,-s -lc++_static -lc++abi
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
endif
ifeq ($(TARGET_ARCH_ABI),x86_64)
LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
endif
LOCAL_STATIC_LIBRARIES := openalsoft_prebuilt
# (or LOCAL_WHOLE_STATIC_LIBRARIES if you need every object pulled in)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ APP_PLATFORM := android-19
APP_OPTIM := release
APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
APP_STL := c++_static
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true