From ed7c80f6bb33a92887dcf4a002c43d0578ca2a28 Mon Sep 17 00:00:00 2001 From: Jonathan De Wachter Date: Tue, 24 Jun 2014 06:39:11 +0200 Subject: [PATCH] [Android] No longer force people to have debug version installed --- src/SFML/Android.mk | 97 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 14 deletions(-) diff --git a/src/SFML/Android.mk b/src/SFML/Android.mk index 51fdd83ea..d3ec278b1 100644 --- a/src/SFML/Android.mk +++ b/src/SFML/Android.mk @@ -5,7 +5,12 @@ LOCAL_MODULE := sfml-system LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-system.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-window @@ -14,15 +19,24 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_LDLIBS := -lEGL -llog -landroid LOCAL_SHARED_LIBRARIES := sfml-system -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-graphics LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-graphics.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES += sfml-system sfml-window -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-audio @@ -30,7 +44,12 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal sndfile -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-network @@ -38,7 +57,12 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-network.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := sfml-system -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-main @@ -46,21 +70,36 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-main.a LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := sfml-window sfml-system -include $(PREBUILT_STATIC_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_STATIC_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-activity LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-activity.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-system-d LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-system-d.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-window-d @@ -69,7 +108,12 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_LDLIBS := -lEGL -llog -landroid LOCAL_SHARED_LIBRARIES := sfml-system-d -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-graphics-d @@ -77,7 +121,12 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-graphics-d.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES += sfml-system-d sfml-window-d -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-audio-d @@ -85,7 +134,12 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio-d.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d openal sndfile -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-network-d @@ -93,7 +147,12 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-network-d.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := sfml-system-d -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-main-d @@ -101,14 +160,24 @@ LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-main-d.a LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d -include $(PREBUILT_STATIC_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_STATIC_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := sfml-activity-d LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-activity-d.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include -include $(PREBUILT_SHARED_LIBRARY) +prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES)) +prebuilt := $(strip $(wildcard $(prebuilt_path))) + +ifdef prebuilt + include $(PREBUILT_SHARED_LIBRARY) +endif $(call import-module,sfml/extlibs)