diff options
| author | sfan5 <sfan5@live.de> | 2021-04-09 21:16:45 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-04-09 21:16:45 +0200 |
| commit | 57218aa9d1cdfcbb101987591b60beb6ab766ca9 (patch) | |
| tree | 1b19452a6a5dd39c65247c0116f45ca0fbfa9386 /build/android | |
| parent | 85163b531f283c52111c3964fd382e4ed1dafeb8 (diff) | |
| download | minetest-57218aa9d1cdfcbb101987591b60beb6ab766ca9.tar.gz minetest-57218aa9d1cdfcbb101987591b60beb6ab766ca9.tar.bz2 minetest-57218aa9d1cdfcbb101987591b60beb6ab766ca9.zip | |
Update Android build config
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/native/jni/Android.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/build/android/native/jni/Android.mk b/build/android/native/jni/Android.mk index 140947e6a..477392af0 100644 --- a/build/android/native/jni/Android.mk +++ b/build/android/native/jni/Android.mk @@ -14,7 +14,7 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := Irrlicht -LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlicht.a +LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlichtMt.a include $(PREBUILT_STATIC_LIBRARY) #include $(CLEAR_VARS) @@ -47,18 +47,6 @@ LOCAL_MODULE := OpenAL LOCAL_SRC_FILES := deps/Android/OpenAL-Soft/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libopenal.a include $(PREBUILT_STATIC_LIBRARY) -# You can use `OpenSSL and Crypto` instead `mbedTLS mbedx509 mbedcrypto`, -#but it increase APK size on ~0.7MB -#include $(CLEAR_VARS) -#LOCAL_MODULE := OpenSSL -#LOCAL_SRC_FILES := deps/Android/OpenSSL/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libssl.a -#include $(PREBUILT_STATIC_LIBRARY) - -#include $(CLEAR_VARS) -#LOCAL_MODULE := Crypto -#LOCAL_SRC_FILES := deps/Android/OpenSSL/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libcrypto.a -#include $(PREBUILT_STATIC_LIBRARY) - include $(CLEAR_VARS) LOCAL_MODULE := Vorbis LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvorbis.a @@ -207,7 +195,6 @@ LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += deps/Android/sqlite/sqlite3.c LOCAL_STATIC_LIBRARIES += Curl Freetype Irrlicht OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT android_native_app_glue $(PROFILER_LIBS) #LevelDB -#OpenSSL Crypto LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES |