Skip to content

Commit 24719c6

Browse files
committed
Android: fix build and update deps
1 parent bbe8386 commit 24719c6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

build/android/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,22 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp
9191
IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp
9292
IRRLICHT_URL_SVN = https://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION)
9393

94-
OPENSSL_VERSION = 1.0.2h
94+
OPENSSL_VERSION = 1.0.2j
9595
OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION)
9696
OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/
9797
OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0
9898
OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp
9999
OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp
100100
OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
101101

102-
CURL_VERSION = 7.48.0
102+
CURL_VERSION = 7.51.0
103103
CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION)
104104
CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
105105
CURL_TIMESTAMP = $(CURL_DIR)/timestamp
106106
CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp
107107
CURL_URL_HTTP = https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2
108108

109-
GMP_VERSION = 6.1.0
109+
GMP_VERSION = 6.1.1
110110
GMP_DIR = $(ANDR_ROOT)/deps/gmp-$(GMP_VERSION)
111111
GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so
112112
GMP_TIMESTAMP = $(GMP_DIR)/timestamp
@@ -126,7 +126,7 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp
126126
ICONV_TIMESTAMP_INT = $(ANDR_ROOT)/deps/iconv_timestamp
127127
ICONV_URL_HTTP = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz
128128

129-
SQLITE3_FOLDER = sqlite-amalgamation-3120200
129+
SQLITE3_FOLDER = sqlite-amalgamation-3150200
130130
SQLITE3_URL = https://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip
131131

132132
ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//')

build/android/jni/Android.mk

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ LOCAL_SRC_FILES := \
203203
jni/src/porting.cpp \
204204
jni/src/profiler.cpp \
205205
jni/src/quicktune.cpp \
206+
jni/src/reflowscan.cpp \
206207
jni/src/remoteplayer.cpp \
207208
jni/src/rollback.cpp \
208209
jni/src/rollback_interface.cpp \

0 commit comments

Comments
 (0)