Cleanup ogg-family (vorbis, theora) includes.

This means only SDL remains that has paths hardcoded.
This commit is contained in:
Miku AuahDark
2019-07-04 12:53:44 +08:00
parent c065fe9e56
commit f8d0890519
3 changed files with 8 additions and 8 deletions
@@ -51,4 +51,6 @@ else ifeq ($(TARGET_ARCH_ABI),x86_64)
lib/x86/x86state.c
endif
LOCAL_STATIC_LIBRARIES := libogg
include $(BUILD_STATIC_LIBRARY)
+5 -4
View File
@@ -1,15 +1,14 @@
LOCAL_PATH:= $(call my-dir)
# libogg
# libvorbis
include $(CLEAR_VARS)
LOCAL_MODULE := libvorbis
LOCAL_CFLAGS := -fexceptions -g -Dlinux -DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT
LOCAL_CPPFLAGS := ${LOCAL_CFLAGS}
LOCAL_C_INCLUDES := \
${LOCAL_PATH}/../libogg-1.3.2/include \
${LOCAL_PATH}/include
LOCAL_C_INCLUDES := ${LOCAL_PATH}/include
LOCAL_EXPORT_C_INCLUDES := ${LOCAL_C_INCLUDES}
LOCAL_SRC_FILES := \
$(filter-out lib/psytune.c lib/vorbisenc.c, $(subst $(LOCAL_PATH)/,,\
@@ -18,4 +17,6 @@ LOCAL_SRC_FILES := \
# $(info libvorbis: include dirs $(LOCAL_C_INCLUDES))
# $(info libvorbis: src files $(LOCAL_SRC_FILES))
LOCAL_STATIC_LIBRARIES := libogg
include $(BUILD_STATIC_LIBRARY)
+1 -4
View File
@@ -23,10 +23,7 @@ LOCAL_C_INCLUDES := \
${LOCAL_PATH}/src/libraries/ \
${LOCAL_PATH}/src/libraries/enet/libenet/include \
${LOCAL_PATH}/src/libraries/physfs \
${LOCAL_PATH}/src/libraries/glslang/glslang/Include \
${LOCAL_PATH}/../libvorbis-1.3.5/include \
${LOCAL_PATH}/../libogg-1.3.2/include \
${LOCAL_PATH}/../libtheora-1.2.0alpha1/include
${LOCAL_PATH}/src/libraries/glslang/glslang/Include
LOCAL_SRC_FILES := \
$(filter-out \