From 015fb7ad45dce4ed91f2dac98c51f7cc58645dea Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sat, 3 Oct 2020 11:04:21 +0000 Subject: [PATCH] Blacklisting for projects which do not work with SDL2 --- project/jni/Android.mk | 2 +- project/jni/application/Android.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/project/jni/Android.mk b/project/jni/Android.mk index 7273a8007..eae21383f 100644 --- a/project/jni/Android.mk +++ b/project/jni/Android.mk @@ -17,7 +17,7 @@ NDK_SUBDIR_MAKEFILES_FULL := $(call all-subdir-makefiles) # If you want to exclude certain subprojects from the build process. # v.g.: SDL2_image already brings it's own implementation of png, so we exclude the bundled one ifeq ($(SDL_VERSION),2.0) -BLACKLISTED_SUBPROJECTS := jpeg png ogg mpg123 timidity +BLACKLISTED_SUBPROJECTS := jpeg png ogg mpg123 timidity fluidsynth faad openal sdl_blitpool sdl_gfx sdl_image sdl_main sdl_mixer sdl_net sdl_sound sdl_ttf zzip else BLACKLISTED_SUBPROJECTS := sdl2_image endif diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index dd1a7be74..5872113ce 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -45,10 +45,15 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),) LOCAL_SRC_FILES := dummy.c endif +ifeq ($(SDL_VERSION),2.0) +LOCAL_SHARED_LIBRARIES := SDL2 $(filter-out $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES)) +else LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) $(filter-out $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES)) +endif LOCAL_STATIC_LIBRARIES := $(filter $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES)) + LOCAL_LDLIBS := $(APPLICATION_GLES_LIBRARY) -ldl -llog -lz LOCAL_LDFLAGS := -Lobj/local/$(TARGET_ARCH_ABI)