diff options
| author | Toad King | 2012-10-29 13:26:25 -0400 |
|---|---|---|
| committer | Toad King | 2012-10-29 13:26:25 -0400 |
| commit | 159dc8eed41f86f841d7b0178ed6a015e8019a5e (patch) | |
| tree | a99bcc412be39ee94f0246bfc6b7b91dff68c36a | |
| parent | f4ea2656730fa58df5d340f367ba2a334295c2eb (diff) | |
| download | pcsx_rearmed-159dc8eed41f86f841d7b0178ed6a015e8019a5e.tar.gz pcsx_rearmed-159dc8eed41f86f841d7b0178ed6a015e8019a5e.tar.bz2 pcsx_rearmed-159dc8eed41f86f841d7b0178ed6a015e8019a5e.zip | |
rename gte_arm.S back to gte_arm.s, fixes compiling on non-Android platforms
fix Android makefile to pass HAVE_ARMV7 symbol to assembler
| -rw-r--r-- | jni/Android.mk | 6 | ||||
| -rw-r--r-- | libpcsxcore/gte_arm.s (renamed from libpcsxcore/gte_arm.S) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 6be42b1..81b885d 100644 --- 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 += -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 diff --git a/libpcsxcore/gte_arm.S b/libpcsxcore/gte_arm.s index 8700f69..8700f69 100644 --- a/libpcsxcore/gte_arm.S +++ b/libpcsxcore/gte_arm.s |