SDL_mixer compilation on x86

Hi,

following patch compiled SDL_mixer for x86 for me. I don’t have a x86 target
device available so I cannot check whether it actually works.

— a/dependencies/SDL_mixer/jni/Android.mk??? Fri Mar 07 11:45:15 2014 +
0100
+++ b/dependencies/SDL_mixer/jni/Android.mk??? Sat Mar 08 12:18:24 2014 +
0100
@@ -100,7 +100,13 @@
?
?ifeq ($(SUPPORT_OGG),true)
??? LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(OGG_LIBRARY_PATH)/include $(LOCAL_
PATH)/$(VORBIS_LIBRARY_PATH)
-??? LOCAL_CFLAGS += -DOGG_MUSIC -DOGG_USE_TREMOR -D_ARM_ASSEM_
+??? LOCAL_CFLAGS += -DOGG_MUSIC -DOGG_USE_TREMOR
+??? ifeq ($(TARGET_ARCH_ABI),armeabi)
+??? LOCAL_CFLAGS += -D_ARM_ASSEM_
+??? endif
+??? ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+??? LOCAL_CFLAGS += -D_ARM_ASSEM_
+??? endif
??? LOCAL_SRC_FILES +=
??? $(VORBIS_LIBRARY_PATH)/mdct.c
??? $(VORBIS_LIBRARY_PATH)/block.c \

Not a nice patch, but you get the idea - don’t define ARM_ASSEM unless
you’re actually building for ARM :slight_smile:

Regards,

Daniel