diff options
| author | Twinaphex | 2019-07-30 22:59:20 +0200 |
|---|---|---|
| committer | GitHub | 2019-07-30 22:59:20 +0200 |
| commit | c209e8cce907005145ea3ba73845b4f9a6933fff (patch) | |
| tree | 20837b4a30f0442a70606412d74104c2144240b7 | |
| parent | 51fd6b0ed8b7583d86a3023bc313290cfb4d5dfe (diff) | |
| parent | 07597ed3a990a0a5abb4399cc62b330699e03d12 (diff) | |
| download | pcsx_rearmed-c209e8cce907005145ea3ba73845b4f9a6933fff.tar.gz pcsx_rearmed-c209e8cce907005145ea3ba73845b4f9a6933fff.tar.bz2 pcsx_rearmed-c209e8cce907005145ea3ba73845b4f9a6933fff.zip | |
Merge pull request #322 from retro-wertz/fix_android_build
Fix android build
| -rw-r--r-- | jni/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 1051e99..2867791 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -17,6 +17,7 @@ NEON_DIR := $(ROOT_DIR)/plugins/gpu_neon UNAI_DIR := $(ROOT_DIR)/plugins/gpu_unai DYNAREC_DIR := $(ROOT_DIR)/libpcsxcore/new_dynarec DEPS_DIR := $(ROOT_DIR)/deps +LIBRETRO_COMMON := $(ROOT_DIR)/libretro-common # core SOURCES_C := $(CORE_DIR)/cdriso.c \ @@ -157,6 +158,7 @@ LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM) LOCAL_CFLAGS := $(COREFLAGS) LOCAL_C_INCLUDES := $(ROOT_DIR)/include LOCAL_C_INCLUDES += $(DEPS_DIR)/crypto $(DEPS_DIR)/flac-1.3.2/include $(DEPS_DIR)/flac-1.3.2/src/libFLAC/include $(DEPS_DIR)/lzma-16.04/C $(DEPS_DIR)/libchdr +LOCAL_C_INCLUDES += $(LIBRETRO_COMMON)/include LOCAL_LDFLAGS := -Wl,-version-script=$(FRONTEND_DIR)/link.T LOCAL_LDLIBS := -lz -llog LOCAL_ARM_MODE := arm |