From 354dbbb02de32eb0eddd9e23f3ec177026570ce2 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 5 Oct 2016 18:42:24 +0300 Subject: [PATCH] SuperTux: updated --- project/jni/application/supertux/AndroidAppSettings.cfg | 4 ++-- project/jni/application/supertux/supertux | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg index f08aaf807..86553af9c 100644 --- a/project/jni/application/supertux/AndroidAppSettings.cfg +++ b/project/jni/application/supertux/AndroidAppSettings.cfg @@ -263,13 +263,13 @@ CompiledLibraries="sdl_image crypto ssl curl openal vorbis ogg" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-DGL_VERSION_ES_CM_1_0=1 -Ijni/openal/include/AL -Ijni/boost/include -frtti -fexceptions -DHAVE_SDL=1 -flto' +AppCflags='-DGL_VERSION_ES_CM_1_0=1 -Ijni/openal/include/AL -Ijni/boost/include -frtti -fexceptions -DHAVE_SDL=1' # -flto crashes the linker # Aditional C++-specific compiler flags for application, added after AppCflags AppCppflags='-std=gnu++11' # Additional LDFLAGS for application -AppLdflags='-frtti -fexceptions -flto' +AppLdflags='-frtti -fexceptions' # -flto -fuse-ld=gold # -flto crashes the linker # If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable AppOverlapsSystemHeaders=n diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux index 5cb68fafa..4db9d6430 160000 --- a/project/jni/application/supertux/supertux +++ b/project/jni/application/supertux/supertux @@ -1 +1 @@ -Subproject commit 5cb68fafa240ae79537fcdcbc41ba1fa96bb2d2a +Subproject commit 4db9d64305fcee661db7b9e01a6ab48a8404fc52