diff --git a/project/jni/Makefile.prebuilt b/project/jni/Makefile.prebuilt index 5edc91a71..0c46120ad 100644 --- a/project/jni/Makefile.prebuilt +++ b/project/jni/Makefile.prebuilt @@ -20,11 +20,10 @@ BOOST_LIBS := \ coroutine \ date_time \ exception \ - fiber \ filesystem \ graph \ iostreams \ - locale \ + json \ log \ log_setup \ math_c99 \ @@ -33,13 +32,12 @@ BOOST_LIBS := \ math_tr1 \ math_tr1f \ math_tr1l \ + nowide \ prg_exec_monitor \ program_options \ random \ regex \ serialization \ - stacktrace_basic \ - stacktrace_noop \ system \ test_exec_monitor \ thread \ @@ -49,6 +47,7 @@ BOOST_LIBS := \ wave \ wserialization \ + BOOST := $(foreach ARCH, $(ARCHES32) $(ARCHES64), $(foreach NAME, $(BOOST_LIBS), boost/lib/$(ARCH)/libboost_$(NAME).a)) .PHONY: all boost icu openssl diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux index aa04dde5c..ddc073e38 160000 --- a/project/jni/application/supertux/supertux +++ b/project/jni/application/supertux/supertux @@ -1 +1 @@ -Subproject commit aa04dde5cf998e273d7f190dfe61e61fed5a3e5e +Subproject commit ddc073e38a285d8879979c20171df78703cd1212