diff options
| author | Twinaphex | 2016-07-05 13:14:06 +0200 |
|---|---|---|
| committer | GitHub | 2016-07-05 13:14:06 +0200 |
| commit | 7e89e240045b5c4145f24387ae993c87e32640fb (patch) | |
| tree | c5b483c3ee431455053834b80887947a88e99680 /jni | |
| parent | 10ed51a07184f5235e1c85cd9995aaa1481e0dca (diff) | |
| parent | 829ebbca0f7964c87309fb34ada247502dad09d7 (diff) | |
| download | pcsx_rearmed-7e89e240045b5c4145f24387ae993c87e32640fb.tar.gz pcsx_rearmed-7e89e240045b5c4145f24387ae993c87e32640fb.tar.bz2 pcsx_rearmed-7e89e240045b5c4145f24387ae993c87e32640fb.zip | |
Merge pull request #49 from meepingsnesroms/master
Fix compiling with ndk r11 >
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 72c6738..36b0c93 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 |