android part 2

akrieger · Jan 17, 2025 · 14915eb · 14915eb
1 parent 3fad6a1
commit 14915eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/android/app/jni/Application.mk b/android/app/jni/Application.mk
@@ -3,6 +3,7 @@
 # See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
 APP_STL := c++_shared
 APP_CPPFLAGS += -std=c++17
+APP_CONLYFLAGS += -std=c17
 ifneq ($(OS),Windows_NT)
     APP_LDFLAGS += -fuse-ld=lld
 endif

diff --git a/android/app/jni/src/Android.mk b/android/app/jni/src/Android.mk
@@ -16,7 +16,7 @@ LOCAL_SHARED_LIBRARIES := libhidapi SDL2 SDL2_mixer SDL2_image SDL2_ttf mpg123
 
 LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog -lz
 
-LOCAL_CFLAGS += -DTILES=1 -DSDL_SOUND=1 -DBACKTRACE=1 -DLOCALIZE=1 -Wextra -Wall -fsigned-char
+LOCAL_CFLAGS += -DTILES=1 -DSDL_SOUND=1 -DBACKTRACE=1 -DLOCALIZE=1 -DZSTD_STATIC_LINKING_ONLY -DZSTD_DISABLE_ASM -Wextra -Wall -fsigned-char
 
 LOCAL_LDFLAGS += $(LOCAL_CFLAGS)
 

diff --git a/android/app/jni/src/third-party/Android.mk b/android/app/jni/src/third-party/Android.mk
@@ -13,7 +13,7 @@ FLATBUFFERS_SRCS := $(sort $(wildcard $(LOCAL_PATH)/third-party/flatbuffers/*.cp
 ZSTD_SRCS := $(sort $(wildcard $(LOCAL_PATH/third-party/zstd/**/*.c)))
 LOCAL_SRC_FILES := $(sort $(FLATBUFFERS_SRCS:$(LOCAL_PATH)/%=%) $(ZSTD_SRCS:$(LOCAL_PATH)/%=%))
 
-LOCAL_CFLAGS += -DBACKTRACE=1 -DLOCALIZE=1 -Wextra -Wall -fsigned-char
+LOCAL_CFLAGS += -DBACKTRACE=1 -DLOCALIZE=1 -DZSTD_STATIC_LINKING_ONLY -DZSTD_DISABLE_ASM -Wextra -Wall -fsigned-char
 
 ifeq ($(OS),Windows_NT)
     # needed to bypass 8191 character limit on Windows command line