diff options
| author | lhofhansl <larsh@apache.org> | 2021-08-31 17:32:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 17:32:31 -0700 |
| commit | d1624a552151bcb152b7abf63df6501b63458d78 (patch) | |
| tree | e73a7b216f23962c06e591c4d0d1e5333d949b08 /android/native | |
| parent | beac4a2c984706b636e7b1e03406e05c87435903 (diff) | |
| download | minetest-d1624a552151bcb152b7abf63df6501b63458d78.tar.gz minetest-d1624a552151bcb152b7abf63df6501b63458d78.tar.bz2 minetest-d1624a552151bcb152b7abf63df6501b63458d78.zip | |
Switch MapBlock compression to zstd (#10788)
* Add zstd support.
* Rearrange serialization order
* Compress entire mapblock
Co-authored-by: sfan5 <sfan5@live.de>
Diffstat (limited to 'android/native')
| -rw-r--r-- | android/native/jni/Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index f92ac1d60..26e9b058b 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -58,6 +58,11 @@ LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvo include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_MODULE := Zstd +LOCAL_SRC_FILES := deps/Android/Zstd/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libzstd.a +include $(PREBUILT_STATIC_LIBRARY) + +include $(CLEAR_VARS) LOCAL_MODULE := Minetest LOCAL_CFLAGS += \ @@ -101,7 +106,8 @@ LOCAL_C_INCLUDES := \ deps/Android/LuaJIT/src \ deps/Android/OpenAL-Soft/include \ deps/Android/sqlite \ - deps/Android/Vorbis/include + deps/Android/Vorbis/include \ + deps/Android/Zstd/include LOCAL_SRC_FILES := \ $(wildcard ../../src/client/*.cpp) \ @@ -201,7 +207,7 @@ LOCAL_SRC_FILES += \ # SQLite3 LOCAL_SRC_FILES += deps/Android/sqlite/sqlite3.c -LOCAL_STATIC_LIBRARIES += Curl Freetype Irrlicht OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT GetText android_native_app_glue $(PROFILER_LIBS) #LevelDB +LOCAL_STATIC_LIBRARIES += Curl Freetype Irrlicht OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT GetText Zstd android_native_app_glue $(PROFILER_LIBS) #LevelDB LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES |