From 456273ebf0c4e16d89d37c8746bae02910d1e9ee Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Thu, 4 Jul 2019 10:11:34 +0800 Subject: [PATCH] Clean include paths of external dependency This way, LOVE Android.mk doesn't have to be modified in case new libraries added or in case old libraries gets updated and their name is different. --- love/src/jni/LuaJIT-2.1/Android.mk | 1 + love/src/jni/libmodplug-0.8.8.4/Android.mk | 5 +++-- love/src/jni/libmodplug-0.8.8.4/{src => }/config.h | 0 love/src/jni/libogg-1.3.2/Android.mk | 10 ++++------ love/src/jni/libtheora-1.2.0alpha1/config.h | 6 +++--- love/src/jni/love/Android.mk | 8 +------- love/src/jni/mpg123-1.17.0/Android.mk | 5 ++--- 7 files changed, 14 insertions(+), 21 deletions(-) rename love/src/jni/libmodplug-0.8.8.4/{src => }/config.h (100%) diff --git a/love/src/jni/LuaJIT-2.1/Android.mk b/love/src/jni/LuaJIT-2.1/Android.mk index c2c21813..b05dc17f 100644 --- a/love/src/jni/LuaJIT-2.1/Android.mk +++ b/love/src/jni/LuaJIT-2.1/Android.mk @@ -4,5 +4,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libluajit LOCAL_SRC_FILES := android/$(TARGET_ARCH_ABI)/libluajit.a +LOCAL_EXPORT_C_INCLUDES := ${LOCAL_PATH}/src include $(PREBUILT_STATIC_LIBRARY) diff --git a/love/src/jni/libmodplug-0.8.8.4/Android.mk b/love/src/jni/libmodplug-0.8.8.4/Android.mk index 5a6beb7c..9690e211 100644 --- a/love/src/jni/libmodplug-0.8.8.4/Android.mk +++ b/love/src/jni/libmodplug-0.8.8.4/Android.mk @@ -7,10 +7,11 @@ LOCAL_MODULE := libmodplug LOCAL_CFLAGS := -fexceptions -g -Dlinux -DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT LOCAL_CPPFLAGS := ${LOCAL_CFLAGS} -LOCAL_C_INCLUDES := \ +LOCAL_C_INCLUDES := \ + ${LOCAL_PATH} \ ${LOCAL_PATH}/src \ ${LOCAL_PATH}/src/libmodplug - +LOCAL_EXPORT_C_INCLUDES := ${LOCAL_PATH}/src LOCAL_SRC_FILES := \ $(filter-out \ , $(subst $(LOCAL_PATH)/,,\ diff --git a/love/src/jni/libmodplug-0.8.8.4/src/config.h b/love/src/jni/libmodplug-0.8.8.4/config.h similarity index 100% rename from love/src/jni/libmodplug-0.8.8.4/src/config.h rename to love/src/jni/libmodplug-0.8.8.4/config.h diff --git a/love/src/jni/libogg-1.3.2/Android.mk b/love/src/jni/libogg-1.3.2/Android.mk index 0c218727..785853ac 100644 --- a/love/src/jni/libogg-1.3.2/Android.mk +++ b/love/src/jni/libogg-1.3.2/Android.mk @@ -7,13 +7,11 @@ LOCAL_MODULE := libogg LOCAL_CFLAGS := -fexceptions -g -Dlinux -DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT LOCAL_CPPFLAGS := ${LOCAL_CFLAGS} -LOCAL_C_INCLUDES := \ - ${LOCAL_PATH}/include - +LOCAL_C_INCLUDES := ${LOCAL_PATH}/include +LOCAL_EXPORT_C_INCLUDES := ${LOCAL_C_INCLUDES} LOCAL_SRC_FILES := \ - $(subst $(LOCAL_PATH)/,, \ - ${LOCAL_PATH}/src/framing.c \ - ${LOCAL_PATH}/src/bitwise.c ) + src/framing.c \ + src/bitwise.c # $(info local includes $(LOCAL_C_INCLUDES)) diff --git a/love/src/jni/libtheora-1.2.0alpha1/config.h b/love/src/jni/libtheora-1.2.0alpha1/config.h index b400796f..3013bbc1 100644 --- a/love/src/jni/libtheora-1.2.0alpha1/config.h +++ b/love/src/jni/libtheora-1.2.0alpha1/config.h @@ -48,13 +48,13 @@ #define LT_OBJDIR ".libs/" /* make use of arm asm optimization */ -#define OC_ARM_ASM /**/ +/* #undef OC_ARM_ASM */ /* Define if assembler supports EDSP instructions */ -#define OC_ARM_ASM_EDSP 1 +/* #undef OC_ARM_ASM_EDSP 1 */ /* Define if assembler supports ARMv6 media instructions */ -#define OC_ARM_ASM_MEDIA 1 +/* #undef OC_ARM_ASM_MEDIA 1 */ /* Define if compiler supports NEON instructions */ /* #undef OC_ARM_ASM_NEON */ diff --git a/love/src/jni/love/Android.mk b/love/src/jni/love/Android.mk index b619876c..9eea4f83 100644 --- a/love/src/jni/love/Android.mk +++ b/love/src/jni/love/Android.mk @@ -24,16 +24,10 @@ LOCAL_C_INCLUDES := \ ${LOCAL_PATH}/src/libraries/enet/libenet/include \ ${LOCAL_PATH}/src/libraries/physfs \ ${LOCAL_PATH}/src/libraries/glslang/glslang/Include \ - ${LOCAL_PATH}/../SDL2-2.0.9/include \ - ${LOCAL_PATH}/../freetype2-android/include \ - ${LOCAL_PATH}/../freetype2-android/src \ - ${LOCAL_PATH}/../mpg123-1.17.0/src/libmpg123 \ - ${LOCAL_PATH}/../libmodplug-0.8.8.4/src \ ${LOCAL_PATH}/../libvorbis-1.3.5/include \ - ${LOCAL_PATH}/../LuaJIT-2.1/src \ ${LOCAL_PATH}/../libogg-1.3.2/include \ ${LOCAL_PATH}/../libtheora-1.2.0alpha1/include - + LOCAL_SRC_FILES := \ $(filter-out \ src/modules/graphics/opengl/GLee.* \ diff --git a/love/src/jni/mpg123-1.17.0/Android.mk b/love/src/jni/mpg123-1.17.0/Android.mk index d828686a..bd7f8abf 100644 --- a/love/src/jni/mpg123-1.17.0/Android.mk +++ b/love/src/jni/mpg123-1.17.0/Android.mk @@ -7,9 +7,8 @@ LOCAL_MODULE := libmpg123 LOCAL_CFLAGS := -fexceptions -g -Dlinux -DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT LOCAL_CPPFLAGS := ${LOCAL_CFLAGS} -LOCAL_C_INCLUDES := \ - ${LOCAL_PATH}/src - +LOCAL_C_INCLUDES := ${LOCAL_PATH}/src +LOCLA_EXPORT_C_INCLUDES := ${LOCAL_C_INCLUDES} LOCAL_SRC_FILES := \ $(filter-out \ src/libmpg123/dct64_altivec.c \