--- ../SDL_image-android-ORIG/Android.mk	2014-04-15 17:24:29.321461384 +0100
+++ Android.mk	2014-04-15 18:28:20.081412964 +0100
@@ -34,6 +34,11 @@
 LOCAL_SHARED_LIBRARIES := SDL2
 
 ifeq ($(SUPPORT_JPG),true)
+	# no assembler for x86
+    ifneq ($(TARGET_ARCH),arm)
+        ANDROID_JPEG_NO_ASSEMBLER := true
+    endif
+
     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)
     LOCAL_CFLAGS += -DLOAD_JPG
     # We can include the sources directly so the user doesn't have to...
@@ -79,13 +84,19 @@
         $(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
+
+		# no assembler for x86
+        ifeq ($(strip $(ANDROID_JPEG_NO_ASSEMBLER)),true)
+            LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.c
+        else
+            LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.S
+        endif
 endif
 
 ifeq ($(SUPPORT_PNG),true)