From 659430e9cc51fc0b5e8bd41cc2525814e7736050 Mon Sep 17 00:00:00 2001 From: "Christoph \"baka0815\" Schwerdtfeger" Date: Sun, 23 Sep 2018 15:43:40 +0200 Subject: [PATCH] CHD: Fixed the build for Android MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CFLAGS were set in the wrong place and the name of the DEF was wrong too -_-° --- shell/android-studio/reicast/src/main/jni/Android.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/android-studio/reicast/src/main/jni/Android.mk b/shell/android-studio/reicast/src/main/jni/Android.mk index 396825b36..603cb2bf9 100644 --- a/shell/android-studio/reicast/src/main/jni/Android.mk +++ b/shell/android-studio/reicast/src/main/jni/Android.mk @@ -44,11 +44,6 @@ else NO_REC := endif -# 7-Zip/LZMA settings (CHDv5) -ifdef USE_LZMA - LOCAL_CFLAGS += -D_7ZIP_ST -DCHD5_LZMA -endif - $(info $$TARGET_ARCH_ABI is [${TARGET_ARCH_ABI}]) include $(LOCAL_PATH)/../../../../../core/core.mk @@ -60,6 +55,11 @@ LOCAL_CFLAGS := $(RZDCY_CFLAGS) -fPIC -fvisibility=hidden -ffunction-sections - LOCAL_CXXFLAGS := $(RZDCY_CXXFLAGS) -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections LOCAL_CPPFLAGS := $(RZDCY_CXXFLAGS) -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections +# 7-Zip/LZMA settings (CHDv5) +ifdef CHD5_LZMA + LOCAL_CFLAGS += -D_7ZIP_ST -DCHD5_LZMA +endif + # LOCAL_CFLAGS += -std=c++11 LOCAL_CXXFLAGS += -std=c++11