From: Squarepusher <libretro@gmail.com>
Date: Wed, 27 Mar 2013 22:33:10 +0000 (-0700)
Subject: Merge pull request #2 from almostalive/master
X-Git-Tag: r24l~958
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b45890371118792a9e992ec92a259f31adc85820;hp=269fec1f8125d51bf482b8e6052e53e0ba8c25e7;p=pcsx_rearmed.git

Merge pull request #2 from almostalive/master

tiny little android neon build fix
---

diff --git a/jni/Android.mk b/jni/Android.mk
index 81962e01..72c67385 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -39,7 +39,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