From 2731a19a0794e6ed74fb4808ce625608cb3d4f73 Mon Sep 17 00:00:00 2001 From: hunterk Date: Mon, 27 Nov 2017 20:15:14 -0600 Subject: [PATCH] hopefully add CHD support to JNI makefile --- libretro/jni/Android.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk index 3b007af..72fb2f6 100644 --- a/libretro/jni/Android.mk +++ b/libretro/jni/Android.mk @@ -8,6 +8,7 @@ ifneq ($(GIT_VERSION)," unknown") endif WANT_CRC32 := 1 +HAVE_CHD := 1 CORE_DIR := ../.. @@ -28,8 +29,12 @@ LOCAL_SRC_FILES := $(SOURCES_C) LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \ $(CORE_DIR)/libretro/libretro-common/include \ $(LOCAL_PATH)/$(TREMOR_SRC_DIR) \ - $(LOCAL_PATH)/$(LIBRETRO_DIR) + $(LOCAL_PATH)/$(LIBRETRO_DIR) \ + $(CHDLIBDIR)/src \ + $(CHDLIBDIR)/deps/libFLAC/include \ + $(CHDLIBDIR)/deps/lzma \ + $(CHDLIBDIR)/deps/zlib -LOCAL_CFLAGS += -ffast-math -O2 -funroll-loops -DINLINE="static inline" -DUSE_LIBTREMOR -DUSE_16BPP_RENDERING -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DALIGN_LONG -DALIGN_WORD -DHAVE_CHD -DM68K_OVERCLOCK_SHIFT=20 -DZ80_OVERCLOCK_SHIFT=20 +LOCAL_CFLAGS += -ffast-math -O2 -funroll-loops -DINLINE="static inline" -DUSE_LIBTREMOR -DUSE_16BPP_RENDERING -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DALIGN_LONG -DALIGN_WORD -DM68K_OVERCLOCK_SHIFT=20 -DZ80_OVERCLOCK_SHIFT=20 -DUSE_LIBCHDR -DPACKAGE_VERSION=\"1.3.2\" -DFLAC_API_EXPORTS -DFLAC__HAS_OGG=0 -DHAVE_LROUND -DHAVE_STDINT_H -D_7ZIP_ST -DHAVE_SYS_PARAM_H include $(BUILD_SHARED_LIBRARY)