Fixed bug 2501 - SDL_image 2 not building JPEG support for Android x86

libsdl-org · Apr 18, 2014 · 7cb931d · 7cb931d
1 parent 4a5d149
commit 7cb931d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Android.mk b/Android.mk
@@ -79,13 +79,19 @@ ifeq ($(SUPPORT_JPG),true)
         $(JPG_LIBRARY_PATH)/jfdctfst.c \
         $(JPG_LIBRARY_PATH)/jfdctint.c \
         $(JPG_LIBRARY_PATH)/jidctflt.c \
-        $(JPG_LIBRARY_PATH)/jidctfst.S \
         $(JPG_LIBRARY_PATH)/jidctint.c \
         $(JPG_LIBRARY_PATH)/jquant1.c \
         $(JPG_LIBRARY_PATH)/jquant2.c \
         $(JPG_LIBRARY_PATH)/jutils.c \
         $(JPG_LIBRARY_PATH)/jmemmgr.c \
         $(JPG_LIBRARY_PATH)/jmem-android.c
+
+    # assembler support is available for arm
+    ifeq ($(TARGET_ARCH),arm)
+        LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.S
+    else
+        LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.c
+    endif
 endif
 
 ifeq ($(SUPPORT_PNG),true)