diff options
Diffstat (limited to 'android/native')
| -rw-r--r-- | android/native/build.gradle | 3 | ||||
| -rw-r--r-- | android/native/jni/Android.mk | 61 | ||||
| -rw-r--r-- | android/native/jni/Application.mk | 2 |
3 files changed, 61 insertions, 5 deletions
diff --git a/android/native/build.gradle b/android/native/build.gradle index 2ddc77135..2254aab3a 100644 --- a/android/native/build.gradle +++ b/android/native/build.gradle @@ -14,7 +14,8 @@ android { "versionMajor=${versionMajor}", "versionMinor=${versionMinor}", "versionPatch=${versionPatch}", - "versionExtra=${versionExtra}" + "versionExtra=${versionExtra}", + "developmentBuild=${developmentBuild}" } } } diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index f8ca74d3c..50651d5ba 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH := $(call my-dir)/.. #LOCAL_ADDRESS_SANITIZER:=true +#USE_BUILTIN_LUA:=true include $(CLEAR_VARS) LOCAL_MODULE := Curl @@ -42,11 +43,15 @@ LOCAL_MODULE := Irrlicht LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libIrrlichtMt.a include $(PREBUILT_STATIC_LIBRARY) +ifndef USE_BUILTIN_LUA + include $(CLEAR_VARS) LOCAL_MODULE := LuaJIT LOCAL_SRC_FILES := deps/$(APP_ABI)/LuaJIT/libluajit.a include $(PREBUILT_STATIC_LIBRARY) +endif + include $(CLEAR_VARS) LOCAL_MODULE := OpenAL LOCAL_SRC_FILES := deps/$(APP_ABI)/OpenAL-Soft/libopenal.a @@ -92,14 +97,20 @@ LOCAL_CFLAGS += \ -DUSE_CURL=1 \ -DUSE_SOUND=1 \ -DUSE_LEVELDB=0 \ - -DUSE_LUAJIT=1 \ -DUSE_GETTEXT=1 \ -DVERSION_MAJOR=${versionMajor} \ -DVERSION_MINOR=${versionMinor} \ -DVERSION_PATCH=${versionPatch} \ -DVERSION_EXTRA=${versionExtra} \ + -DDEVELOPMENT_BUILD=${developmentBuild} \ $(GPROF_DEF) +ifdef USE_BUILTIN_LUA + LOCAL_CFLAGS += -DUSE_LUAJIT=0 +else + LOCAL_CFLAGS += -DUSE_LUAJIT=1 +endif + ifdef NDEBUG LOCAL_CFLAGS += -DNDEBUG=1 endif @@ -120,12 +131,19 @@ LOCAL_C_INCLUDES := \ deps/$(APP_ABI)/Irrlicht/include \ deps/$(APP_ABI)/Gettext/include \ deps/$(APP_ABI)/Iconv/include \ - deps/$(APP_ABI)/LuaJIT/include \ deps/$(APP_ABI)/OpenAL-Soft/include \ deps/$(APP_ABI)/SQLite/include \ deps/$(APP_ABI)/Vorbis/include \ deps/$(APP_ABI)/Zstd/include +ifdef USE_BUILTIN_LUA + LOCAL_C_INCLUDES += \ + ../../lib/lua/src \ + ../../lib/bitop +else + LOCAL_C_INCLUDES += deps/$(APP_ABI)/LuaJIT/include +endif + LOCAL_SRC_FILES := \ $(wildcard ../../src/client/*.cpp) \ $(wildcard ../../src/client/*/*.cpp) \ @@ -207,6 +225,41 @@ LOCAL_SRC_FILES := \ ../../src/voxel.cpp \ ../../src/voxelalgorithms.cpp +# Built-in Lua +ifdef USE_BUILTIN_LUA + LOCAL_SRC_FILES += \ + ../../lib/lua/src/lapi.c \ + ../../lib/lua/src/lauxlib.c \ + ../../lib/lua/src/lbaselib.c \ + ../../lib/lua/src/lcode.c \ + ../../lib/lua/src/ldblib.c \ + ../../lib/lua/src/ldebug.c \ + ../../lib/lua/src/ldo.c \ + ../../lib/lua/src/ldump.c \ + ../../lib/lua/src/lfunc.c \ + ../../lib/lua/src/lgc.c \ + ../../lib/lua/src/linit.c \ + ../../lib/lua/src/liolib.c \ + ../../lib/lua/src/llex.c \ + ../../lib/lua/src/lmathlib.c \ + ../../lib/lua/src/lmem.c \ + ../../lib/lua/src/loadlib.c \ + ../../lib/lua/src/lobject.c \ + ../../lib/lua/src/lopcodes.c \ + ../../lib/lua/src/loslib.c \ + ../../lib/lua/src/lparser.c \ + ../../lib/lua/src/lstate.c \ + ../../lib/lua/src/lstring.c \ + ../../lib/lua/src/lstrlib.c \ + ../../lib/lua/src/ltable.c \ + ../../lib/lua/src/ltablib.c \ + ../../lib/lua/src/ltm.c \ + ../../lib/lua/src/lundump.c \ + ../../lib/lua/src/lvm.c \ + ../../lib/lua/src/lzio.c \ + ../../lib/bitop/bit.c +endif + # GMP LOCAL_SRC_FILES += ../../lib/gmp/mini-gmp.c @@ -218,12 +271,14 @@ LOCAL_STATIC_LIBRARIES += \ Freetype \ Iconv libcharset \ Irrlicht \ - LuaJIT \ OpenAL \ Gettext \ SQLite3 \ Vorbis libvorbisfile libogg \ Zstd +ifndef USE_BUILTIN_LUA + LOCAL_STATIC_LIBRARIES += LuaJIT +endif LOCAL_STATIC_LIBRARIES += android_native_app_glue $(PROFILER_LIBS) LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES diff --git a/android/native/jni/Application.mk b/android/native/jni/Application.mk index e21bca61c..9d9596137 100644 --- a/android/native/jni/Application.mk +++ b/android/native/jni/Application.mk @@ -20,7 +20,7 @@ APP_CPPFLAGS := -g -Og -fno-omit-frame-pointer endif APP_CFLAGS := $(APP_CPPFLAGS) -Wno-inconsistent-missing-override -Wno-parentheses-equality -APP_CXXFLAGS := $(APP_CPPFLAGS) -fexceptions -frtti -std=gnu++17 +APP_CXXFLAGS := $(APP_CPPFLAGS) -fexceptions -frtti -std=gnu++14 APP_LDFLAGS := -Wl,--no-warn-mismatch,--gc-sections,--icf=safe ifeq ($(APP_ABI),arm64-v8a) |