From 4cdad6573bbb3e6e09ae9dc10ba4eade6c8d4750 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 3 Jan 2022 00:07:15 +0200 Subject: [PATCH] Fixed app build script --- project/jni/application/Android.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index 6fea1874c..091e7a66d 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -6,9 +6,7 @@ LOCAL_MODULE := application APPDIR := $(shell readlink $(LOCAL_PATH)/src) -SDL_LIB := $(if $(filter 1.2, $(SDL_VERSION)), sdl-1.2, SDL2) - -LOCAL_SHARED_LIBRARIES := $(SDL_LIB_NAME) $(filter-out $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES)) +LOCAL_SHARED_LIBRARIES := $(if $(filter 1.2, $(SDL_VERSION)), sdl-1.2, SDL2) $(filter-out $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES)) LOCAL_STATIC_LIBRARIES := $(filter $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES)) @@ -47,7 +45,7 @@ LOCAL_CFLAGS += $(foreach D, $(LOCAL_C_INCLUDES), -iquote$(D)) LOCAL_C_INCLUDES := endif -LOCAL_C_INCLUDES += $(LOCAL_PATH)/../$(SDL_LIB_NAME)/include +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../$(strip $(if $(filter 1.2, $(SDL_VERSION)), sdl-1.2, SDL2))/include LOCAL_C_INCLUDES += $(foreach L, $(COMPILED_LIBRARIES), $(LOCAL_PATH)/../$(L)/include) LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)