diff options
| author | Maksim Gamarnik <MoNTE48@mail.ua> | 2015-03-07 14:34:31 +0200 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-03-08 15:48:40 +1000 |
| commit | c788b1732225ed0c118ed11b184bb5d3b35e1f7c (patch) | |
| tree | 1f95fd2a90b2deef4c3084dcb96e6ab253bfabf3 | |
| parent | d463000595ee2b8bce94e5b99e764be6e1fd52f6 (diff) | |
| download | minetest-c788b1732225ed0c118ed11b184bb5d3b35e1f7c.tar.gz minetest-c788b1732225ed0c118ed11b184bb5d3b35e1f7c.tar.bz2 minetest-c788b1732225ed0c118ed11b184bb5d3b35e1f7c.zip | |
Update Android Makefile
ARMv7 default build
Update curl
Update OpenSSL
| -rw-r--r-- | build/android/Makefile | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 6027982ed..8cf2f32e6 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -31,33 +31,33 @@ ANDROID_VERSION_CODE = 6 ################################################################################ # toolchain config for arm old processors ################################################################################ -TARGET_HOST = arm-linux -TARGET_ABI = armeabi -TARGET_LIBDIR = armeabi -TARGET_TOOLCHAIN = arm-linux-androideabi- -TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp -TARGET_ARCH = arm -CROSS_PREFIX = arm-linux-androideabi- -COMPILER_VERSION = 4.8 -HAVE_LEVELDB = 1 - -################################################################################ -# toolchain config for arm new processors -################################################################################ #TARGET_HOST = arm-linux -#TARGET_ABI = armeabi-v7a-hard -#TARGET_LIBDIR = armeabi-v7a +#TARGET_ABI = armeabi +#TARGET_LIBDIR = armeabi #TARGET_TOOLCHAIN = arm-linux-androideabi- -#TARGET_CFLAGS_ADDON = -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 \ -# -mfloat-abi=hard -march=armv7-a -#TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) -#TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard -#TARGET_ARCH = armv7 +#TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp +#TARGET_ARCH = arm #CROSS_PREFIX = arm-linux-androideabi- #COMPILER_VERSION = 4.8 #HAVE_LEVELDB = 1 ################################################################################ +# toolchain config for arm new processors +################################################################################ +TARGET_HOST = arm-linux +TARGET_ABI = armeabi-v7a-hard +TARGET_LIBDIR = armeabi-v7a +TARGET_TOOLCHAIN = arm-linux-androideabi- +TARGET_CFLAGS_ADDON = -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 \ + -mfloat-abi=hard -march=armv7-a +TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) +TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard +TARGET_ARCH = armv7 +CROSS_PREFIX = arm-linux-androideabi- +COMPILER_VERSION = 4.8 +HAVE_LEVELDB = 1 + +################################################################################ # toolchain config for little endian mips ################################################################################ #TARGET_HOST = mipsel-linux @@ -109,7 +109,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/ -OPENSSL_VERSION = 1.0.1j +OPENSSL_VERSION = 1.0.1l OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 @@ -117,7 +117,7 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.40.0 +CURL_VERSION = 7.41.0 CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp |