Merge pull request #321 from fpscan/master

[pcsx_rearmed.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index f48674c..1051e99 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -4,6 +4,8 @@ $(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV
 $(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h))
 $(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_))
 
+HAVE_CHD ?= 1
+
 ROOT_DIR     := $(LOCAL_PATH)/..
 CORE_DIR     := $(ROOT_DIR)/libpcsxcore
 SPU_DIR      := $(ROOT_DIR)/plugins/dfsound
@@ -117,7 +119,7 @@ SOURCES_C += $(DYNAREC_DIR)/backends/psx/emu_if.c
 
 COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED
 COREFLAGS += -DPACKAGE_VERSION=\"1.3.2\" -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST -DHAVE_SYS_PARAM_H
-
+COREFLAGS += -DHAVE_CHD
 
 ifeq ($(TARGET_ARCH),arm)
   SOURCES_ASM := $(CORE_DIR)/gte_arm.S \