diff options
| author | twinaphex | 2012-11-28 06:34:54 +0100 |
|---|---|---|
| committer | twinaphex | 2012-11-28 06:34:54 +0100 |
| commit | e028d41faec61a43865cc65b7a5bbc3a87a9adff (patch) | |
| tree | 05267f609a05934d03d7ad0668dd346ab57e98dc | |
| parent | 159dc8eed41f86f841d7b0178ed6a015e8019a5e (diff) | |
| download | pcsx_rearmed-e028d41faec61a43865cc65b7a5bbc3a87a9adff.tar.gz pcsx_rearmed-e028d41faec61a43865cc65b7a5bbc3a87a9adff.tar.bz2 pcsx_rearmed-e028d41faec61a43865cc65b7a5bbc3a87a9adff.zip | |
Revert "rename gte_arm.S back to gte_arm.s, fixes compiling on non-Android platforms"
This reverts commit 159dc8eed41f86f841d7b0178ed6a015e8019a5e.
| -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 81b885d..6be42b1 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 += -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 index 8700f69..8700f69 100644 --- a/libpcsxcore/gte_arm.s +++ b/libpcsxcore/gte_arm.S |