X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=36b0c9312e21148fc85394fd0428e7083d2075be;hb=7e89e240045b5c4145f24387ae993c87e32640fb;hp=81962e01c188dd0e52190141543087f566df5ba7;hpb=ad72cb33d8ef068b92a059a774dd7871d052a707;p=pcsx_rearmed.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 81962e01..36b0c931 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -4,6 +4,9 @@ include $(CLEAR_VARS)
 
 APP_DIR := ../../src
 
+#fix stupid change in ndk r11 that breaks compiling even when the exe would run fine
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
 ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
    NO_NEON_BUILD := 1
 else
@@ -39,7 +42,7 @@ ifeq ($(TARGET_ARCH),arm)
    else
       LOCAL_ARM_NEON := true
       LOCAL_CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
-      LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../frontend/cspace_neon.s
+      LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../frontend/cspace_neon.S
 
       # gpu
       LOCAL_SRC_FILES += ../plugins/gpu_neon/psx_gpu_if.c ../plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S