diff options
| author | Andrés | 2018-04-04 14:39:30 -0500 |
|---|---|---|
| committer | GitHub | 2018-04-04 14:39:30 -0500 |
| commit | c9448599144e9d2ec6c7d6cb60b67a7fcade9f7e (patch) | |
| tree | 5f9f49acc5033f9ed16e33997b143007a8bc7cf9 /jni | |
| parent | ea4f4384c24996e839106d515f000269b5cfc792 (diff) | |
| parent | 245d35798fde169db8fa60bda2e86603233c1ea0 (diff) | |
| download | pcsx_rearmed-c9448599144e9d2ec6c7d6cb60b67a7fcade9f7e.tar.gz pcsx_rearmed-c9448599144e9d2ec6c7d6cb60b67a7fcade9f7e.tar.bz2 pcsx_rearmed-c9448599144e9d2ec6c7d6cb60b67a7fcade9f7e.zip | |
Merge pull request #157 from webgeek1234/master
Fix android jni compile with clang
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 1 | ||||
| -rw-r--r-- | jni/Application.mk | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 9dd9e39..7d21514 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -102,6 +102,7 @@ LOCAL_SRC_FILES += ../frontend/libretro.c LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include +LOCAL_LDFLAGS := -Wl,-Bsymbolic -shared LOCAL_LDLIBS := -lz -llog include $(BUILD_SHARED_LIBRARY) diff --git a/jni/Application.mk b/jni/Application.mk index 3e882e7..f05229c 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,2 +1 @@ APP_ABI := armeabi armeabi-v7a -APP_PLATFORM := android-9 |