external libs/libmodplug: remove empty load_j2b from android makefile

libsdl-org · Nov 24, 2019 · 71a0d5d · 71a0d5d
1 parent 98d1166
commit 71a0d5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/external/libmodplug-0.8.9.0.patch b/external/libmodplug-0.8.9.0.patch
@@ -8,9 +8,9 @@ diff -ruN libmodplug-0.8.9.0.orig/Android.mk libmodplug-0.8.9.0/Android.mk
 +
 +LOCAL_MODULE := modplug
 +
-+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/src/libmodplug 
++LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/src/libmodplug
 +
-+LOCAL_CFLAGS += -DHAVE_SETENV -DHAVE_SINF
++LOCAL_CFLAGS += -DHAVE_SETENV -DHAVE_SINF -DHAVE_STDINT_H
 +
 +LOCAL_SRC_FILES += \
 +    src/fastmix.cpp \
@@ -23,7 +23,6 @@ diff -ruN libmodplug-0.8.9.0.orig/Android.mk libmodplug-0.8.9.0/Android.mk
 +    src/load_dsm.cpp \
 +    src/load_far.cpp \
 +    src/load_it.cpp \
-+    src/load_j2b.cpp \
 +    src/load_mdl.cpp \
 +    src/load_med.cpp \
 +    src/load_mid.cpp \

diff --git a/external/libmodplug-0.8.9.0/Android.mk b/external/libmodplug-0.8.9.0/Android.mk
@@ -4,9 +4,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := modplug
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/src/libmodplug 
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/src/libmodplug
 
-LOCAL_CFLAGS += -DHAVE_SETENV -DHAVE_SINF
+LOCAL_CFLAGS += -DHAVE_SETENV -DHAVE_SINF -DHAVE_STDINT_H
 
 LOCAL_SRC_FILES += \
     src/fastmix.cpp \
@@ -19,7 +19,6 @@ LOCAL_SRC_FILES += \
     src/load_dsm.cpp \
     src/load_far.cpp \
     src/load_it.cpp \
-    src/load_j2b.cpp \
     src/load_mdl.cpp \
     src/load_med.cpp \
     src/load_mid.cpp \