Revert "rename gte_arm.S back to gte_arm.s, fixes compiling on non-Android platforms"

This reverts commit 159dc8eed41f86f841d7b0178ed6a015e8019a5e.

diff --git a/jni/Android.mk b/jni/Android.mk
index 81b885d..6be42b1 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -20,14 +20,14 @@ ifeq ($(TARGET_ARCH),arm)
    LOCAL_ARM_MODE := arm
 
    ifeq ($(TARGET_ARCH_EABI),armeabi-v7a)
-      LOCAL_CFLAGS += -Wa,--defsym,HAVE_ARMV7=1
+      LOCAL_CFLAGS += -DHAVE_ARMV7=1
    else
-      LOCAL_CFLAGS += -Wa,--defsym,HAVE_ARMV7=0
+      LOCAL_CFLAGS += -DHAVE_ARMV7=0
    endif
 
    LOCAL_CFLAGS += -DANDROID_ARM
 
-   LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.s
+   LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.S
 
    # dynarec
    LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/linkage_arm.S ../libpcsxcore/new_dynarec/emu_if.c ../libpcsxcore/new_dynarec/pcsxmem.c

diff --git a/libpcsxcore/gte_arm.s b/libpcsxcore/gte_arm.S
similarity index 100%
rename from libpcsxcore/gte_arm.s
rename to libpcsxcore/gte_arm.S