Fixed bug 2461 - Allow compilation of SDL_mixer for Android x86

Daniel Sobe the following patch enables compilation of SDL_mixer for Android x86. I have checked and there doesn't seem to be a nicer way to change the makefile. The patch disables the _ARM_ASSEM_ #define if the platform is not ARM.
libsdl-org · Mar 23, 2014 · 145fdb1 · 145fdb1
1 parent 32a0dd2
commit 145fdb1
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Android.mk b/Android.mk
@@ -89,7 +89,13 @@ endif
 
 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 \