From 181f7baa453c58d4070de7196fd74663110946a8 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 12 Apr 2015 06:18:48 +0200 Subject: Add LibGMP Uses system provided libgmp if found, if not it falls back to mini-gmp. --- build/android/jni/Android.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'build/android/jni') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 722efa42b..2b582051e 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -39,6 +39,11 @@ LOCAL_MODULE := vorbis LOCAL_SRC_FILES := deps/libvorbis-libogg-android/libs/$(TARGET_LIBDIR)/libvorbis.so include $(PREBUILT_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := gmp +LOCAL_SRC_FILES := deps/gmp/usr/lib/libgmp.so +include $(PREBUILT_SHARED_LIBRARY) + include $(CLEAR_VARS) LOCAL_MODULE := ssl LOCAL_SRC_FILES := deps/openssl/libssl.a @@ -49,7 +54,6 @@ LOCAL_MODULE := crypto LOCAL_SRC_FILES := deps/openssl/libcrypto.a include $(PREBUILT_STATIC_LIBRARY) - include $(CLEAR_VARS) LOCAL_MODULE := minetest @@ -97,6 +101,7 @@ LOCAL_C_INCLUDES := \ deps/curl/include \ deps/openal-soft/jni/OpenAL/include \ deps/libvorbis-libogg-android/jni/include \ + deps/gmp/usr/include \ deps/leveldb/include \ deps/sqlite/ @@ -283,7 +288,7 @@ LOCAL_SRC_FILES += \ jni/src/script/lua_api/l_vmanip.cpp \ jni/src/script/scripting_game.cpp \ jni/src/script/scripting_mainmenu.cpp - + #freetype2 support LOCAL_SRC_FILES += \ jni/src/cguittfont/xCGUITTFont.cpp @@ -334,7 +339,7 @@ LOCAL_SRC_FILES += \ # json LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp -LOCAL_SHARED_LIBRARIES := openal ogg vorbis +LOCAL_SHARED_LIBRARIES := openal ogg vorbis gmp LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) ifeq ($(HAVE_LEVELDB), 1) -- cgit v1.2.3