From e028d41faec61a43865cc65b7a5bbc3a87a9adff Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 28 Nov 2012 06:34:54 +0100 Subject: [PATCH] Revert "rename gte_arm.S back to gte_arm.s, fixes compiling on non-Android platforms" This reverts commit 159dc8eed41f86f841d7b0178ed6a015e8019a5e. --- jni/Android.mk | 6 +++--- libpcsxcore/{gte_arm.s => gte_arm.S} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename libpcsxcore/{gte_arm.s => gte_arm.S} (100%) diff --git a/jni/Android.mk b/jni/Android.mk index 81b885da..6be42b1c 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 similarity index 100% rename from libpcsxcore/gte_arm.s rename to libpcsxcore/gte_arm.S -- 2.39.5