Merge pull request #120 from hizzlekizzle/master

hopefully add CHD support to JNI makefile
This commit is contained in:
Twinaphex 2017-11-28 03:59:21 +01:00 committed by GitHub
commit 4e1b797e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,6 +8,7 @@ ifneq ($(GIT_VERSION)," unknown")
endif endif
WANT_CRC32 := 1 WANT_CRC32 := 1
HAVE_CHD := 1
CORE_DIR := ../.. CORE_DIR := ../..
@ -28,8 +29,12 @@ LOCAL_SRC_FILES := $(SOURCES_C)
LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \ LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \
$(CORE_DIR)/libretro/libretro-common/include \ $(CORE_DIR)/libretro/libretro-common/include \
$(LOCAL_PATH)/$(TREMOR_SRC_DIR) \ $(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) include $(BUILD_SHARED_LIBRARY)