From 159dc8eed41f86f841d7b0178ed6a015e8019a5e Mon Sep 17 00:00:00 2001 From: Toad King Date: Mon, 29 Oct 2012 13:26:25 -0400 Subject: [PATCH] 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 --- 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 6be42b1c..81b885da 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 similarity index 100% rename from libpcsxcore/gte_arm.S rename to libpcsxcore/gte_arm.s -- 2.39.5