From 2b18728ed5425cf5cedecb206e8ab5edb47aedc5 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 12 Oct 2018 17:14:04 +0300 Subject: [PATCH] SDL: removed gnustl_static from makefiles --- project/jni/Android.mk | 2 +- project/jni/Application.mk | 4 ++-- project/jni/SettingsTemplate.mk | 5 ---- project/jni/application/Android.mk | 23 +------------------ .../ballfield/AndroidAppSettings.cfg | 2 +- project/jni/application/launchConfigure.sh | 7 ------ 6 files changed, 5 insertions(+), 38 deletions(-) delete mode 100755 project/jni/application/launchConfigure.sh diff --git a/project/jni/Android.mk b/project/jni/Android.mk index 6d27502c6..b608388a0 100644 --- a/project/jni/Android.mk +++ b/project/jni/Android.mk @@ -7,7 +7,7 @@ endif NDK_VERSION := $(strip $(patsubst android-ndk-%,%,$(filter android-ndk-%, $(subst /, ,$(dir $(TARGET_CC)))))) #$(info NDK version $(NDK_VERSION)) # This warning puzzles ndk-gdb ifneq ($(filter r1 r2 r3 r4 r5 r6 r7 r8,$(NDK_VERSION)),) -$(error Your NDK $(NDK_VERSION) is too old, please download NDK r4b, r5c or r6 from http://developer.android.com) +$(error Your NDK $(NDK_VERSION) is too old, please download NDK from http://developer.android.com) endif NDK_PATH := $(shell dirname $(shell which ndk-build)) diff --git a/project/jni/Application.mk b/project/jni/Application.mk index 1978efafc..758fd1213 100644 --- a/project/jni/Application.mk +++ b/project/jni/Application.mk @@ -2,8 +2,8 @@ APP_PROJECT_PATH := $(call my-dir)/.. include jni/Settings.mk -APP_STL := $(if $(filter clang%, $(NDK_TOOLCHAIN_VERSION)), c++_static, gnustl_static) -APP_CFLAGS := -O3 -DNDEBUG -g # arm-linux-androideabi-4.4.3 crashes in -O0 mode on SDL sources +APP_STL := c++_static +APP_CFLAGS := -Oz -DNDEBUG -g # -Oz works best with clang APP_PIE := true # This feature makes executables incompatible to Android API 15 or lower, but executables without PIE will not run on Android 5.0 and newer SDL_EXCLUDE_LIBGCC := -Wl,--exclude-libs,libgcc.a SDL_EXCLUDE_LIBUNWIND := -Wl,--exclude-libs,libunwind.a diff --git a/project/jni/SettingsTemplate.mk b/project/jni/SettingsTemplate.mk index ff8f90fae..6976dcffb 100644 --- a/project/jni/SettingsTemplate.mk +++ b/project/jni/SettingsTemplate.mk @@ -60,11 +60,6 @@ SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCO SDL_VERSION := 1.2 -# Link-time optimization enabled for optimization junkies. -O999 etc -#APP_CFLAGS := -flto -#APP_CXXFLAGS := -flto -#APP_LDFLAGS := -flto -# Latest GCC got better LTO support NDK_TOOLCHAIN_VERSION := clang APP_PLATFORM := android-16 diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index 5917a40b3..dd1a7be74 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -49,9 +49,7 @@ LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) $(filter-out $(APP_AVAILABLE_STATIC LOCAL_STATIC_LIBRARIES := $(filter $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES)) -APP_STL := gnustl_static - -LOCAL_LDLIBS := $(APPLICATION_GLES_LIBRARY) -ldl -llog -lz # -lgnustl_static +LOCAL_LDLIBS := $(APPLICATION_GLES_LIBRARY) -ldl -llog -lz LOCAL_LDFLAGS := -Lobj/local/$(TARGET_ARCH_ABI) @@ -88,31 +86,12 @@ LOCAL_PATH_SDL_APPLICATION := $(LOCAL_PATH) $(shell cd $(LOCAL_PATH_SDL_APPLICATION)/src && $(PARALLEL_UNLOCK)) -obj/local/armeabi/libapplication.so: $(LOCAL_PATH)/src/libapplication-armeabi.so - -$(LOCAL_PATH)/src/libapplication-armeabi.so: $(SDL_APP_LIB_DEPENDS-armeabi) OVERRIDE_CUSTOM_LIB - cd $(LOCAL_PATH_SDL_APPLICATION)/src && $(PARALLEL_LOCK) && \ - ./AndroidBuild.sh armeabi arm-linux-androideabi && $(PARALLEL_UNLOCK) && \ - { [ -e libapplication.so ] && ln -s libapplication.so libapplication-armeabi.so || true ; } - obj/local/armeabi-v7a/libapplication.so: $(LOCAL_PATH)/src/libapplication-armeabi-v7a.so $(LOCAL_PATH)/src/libapplication-armeabi-v7a.so: $(SDL_APP_LIB_DEPENDS-armeabi-v7a) OVERRIDE_CUSTOM_LIB cd $(LOCAL_PATH_SDL_APPLICATION)/src && $(PARALLEL_LOCK) && \ ./AndroidBuild.sh armeabi-v7a arm-linux-androideabi && $(PARALLEL_UNLOCK) -obj/local/armeabi-v7a-hard/libapplication.so: $(LOCAL_PATH)/src/libapplication-armeabi-v7a-hard.so - -$(LOCAL_PATH)/src/libapplication-armeabi-v7a-hard.so: $(SDL_APP_LIB_DEPENDS-armeabi-v7a-hard) OVERRIDE_CUSTOM_LIB - cd $(LOCAL_PATH_SDL_APPLICATION)/src && $(PARALLEL_LOCK) && \ - ./AndroidBuild.sh armeabi-v7a-hard arm-linux-androideabi && $(PARALLEL_UNLOCK) - -obj/local/mips/libapplication.so: $(LOCAL_PATH)/src/libapplication-mips.so - -$(LOCAL_PATH)/src/libapplication-mips.so: $(SDL_APP_LIB_DEPENDS-mips) OVERRIDE_CUSTOM_LIB - cd $(LOCAL_PATH_SDL_APPLICATION)/src && $(PARALLEL_LOCK) && \ - ./AndroidBuild.sh mips mipsel-linux-android && $(PARALLEL_UNLOCK) - obj/local/x86/libapplication.so: $(LOCAL_PATH)/src/libapplication-x86.so $(LOCAL_PATH)/src/libapplication-x86.so: $(SDL_APP_LIB_DEPENDS-x86) OVERRIDE_CUSTOM_LIB diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 0c1dc08ec..b57a87ed8 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -283,7 +283,7 @@ CustomBuildScript=n AppCflags='' # Aditional C++-specific compiler flags for application, added after AppCflags -AppCppflags='' +AppCppflags='-fexceptions' # Additional LDFLAGS for application AppLdflags='' diff --git a/project/jni/application/launchConfigure.sh b/project/jni/application/launchConfigure.sh deleted file mode 100755 index f213f7877..000000000 --- a/project/jni/application/launchConfigure.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -LOCAL_PATH=`dirname $0` -LOCAL_PATH=`cd $LOCAL_PATH && pwd` - -$LOCAL_PATH/setEnvironment.sh ./configure --host=arm-eabi "$@" -