rename gte_arm.S back to gte_arm.s, fixes compiling on non-Android platforms
authorToad King <toadking@toadking.com>
Mon, 29 Oct 2012 17:26:25 +0000 (13:26 -0400)
committerToad King <toadking@toadking.com>
Mon, 29 Oct 2012 17:26:25 +0000 (13:26 -0400)
fix Android makefile to pass HAVE_ARMV7 symbol to assembler

jni/Android.mk
libpcsxcore/gte_arm.s [moved from libpcsxcore/gte_arm.S with 100% similarity]

index 6be42b1..81b885d 100644 (file)
@@ -20,14 +20,14 @@ ifeq ($(TARGET_ARCH),arm)
    LOCAL_ARM_MODE := arm
 
    ifeq ($(TARGET_ARCH_EABI),armeabi-v7a)
-      LOCAL_CFLAGS += -DHAVE_ARMV7=1
+      LOCAL_CFLAGS += -Wa,--defsym,HAVE_ARMV7=1
    else
-      LOCAL_CFLAGS += -DHAVE_ARMV7=0
+      LOCAL_CFLAGS += -Wa,--defsym,HAVE_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
similarity index 100%
rename from libpcsxcore/gte_arm.S
rename to libpcsxcore/gte_arm.s