notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainline' into libretro
[pcsx_rearmed.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
05a92d4
..
36b0c93
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-4,6
+4,9
@@
include $(CLEAR_VARS)
APP_DIR := ../../src
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
ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
NO_NEON_BUILD := 1
else
@@
-35,10
+38,11
@@
ifeq ($(TARGET_ARCH),arm)
# gpu
LOCAL_CFLAGS += -DREARMED
LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s
# gpu
LOCAL_CFLAGS += -DREARMED
LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s
+ LOCAL_SRC_FILES += ../frontend/cspace_arm.S
else
LOCAL_ARM_NEON := true
LOCAL_CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
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
# gpu
LOCAL_SRC_FILES += ../plugins/gpu_neon/psx_gpu_if.c ../plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S