From 58d4a55696503d551febb7beedf1c16d4ce3798c Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Sat, 25 Jul 2015 09:08:20 +0200 Subject: [PATCH] build: fix makefiles --- core/build.h | 10 ++++++++-- shell/android/jni/Android.mk | 6 +++--- shell/gcwz/Makefile | 2 +- shell/mac86/Makefile | 2 +- shell/nacl/Makefile | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/core/build.h b/core/build.h index 50e3b5d4e..8e3d828a8 100755 --- a/core/build.h +++ b/core/build.h @@ -208,6 +208,12 @@ #define FEAT_DSPREC DYNAREC_NONE #endif +#if defined(TARGET_NO_AREC) +#define FEAT_SHREC DYNAREC_JIT +#define FEAT_AREC DYNAREC_NONE +#define FEAT_DSPREC DYNAREC_NONE +#endif + #if defined(TARGET_NO_JIT) #define FEAT_SHREC DYNAREC_CPP #define FEAT_AREC DYNAREC_NONE @@ -237,9 +243,9 @@ //Depricated build configs #ifdef HOST_NO_REC -#error Outdated build config +#error Dont use HOST_NO_REC #endif #ifdef HOST_NO_AREC -#error Outdated build config +#error Dont use HOST_NO_AREC #endif \ No newline at end of file diff --git a/shell/android/jni/Android.mk b/shell/android/jni/Android.mk index 80b9fbac9..fb137cc3f 100644 --- a/shell/android/jni/Android.mk +++ b/shell/android/jni/Android.mk @@ -54,9 +54,9 @@ LOCAL_CXXFLAGS := $(RZDCY_CXXFLAGS) -fvisibility=hidden -fvisibility-inlines-hi LOCAL_CPPFLAGS := $(RZDCY_CXXFLAGS) -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections ifeq ($(TARGET_ARCH_ABI),x86) - LOCAL_CFLAGS+= -DHOST_NO_AREC - LOCAL_CXXFLAGS+= -DHOST_NO_AREC -fpermissive - LOCAL_CPPFLAGS+= -DHOST_NO_AREC + LOCAL_CFLAGS+= -DTARGET_NO_AREC + LOCAL_CXXFLAGS+= -DTARGET_NO_AREC -fpermissive + LOCAL_CPPFLAGS+= -DTARGET_NO_AREC endif LOCAL_CPP_FEATURES := diff --git a/shell/gcwz/Makefile b/shell/gcwz/Makefile index 03cc37618..1f7e3dc29 100644 --- a/shell/gcwz/Makefile +++ b/shell/gcwz/Makefile @@ -33,7 +33,7 @@ SOURCES := cfg/ hw/arm7/ hw/aica/ hw/asic/ hw/ hw/gdrom/ hw/maple/ \ hw/extdev/ hw/arm/ imgread/ linux/ linux-dist/ ./ rec-ARM/ deps/zlib/ deps/chdr/ deps/crypto/ arm_emitter/ -CXXFLAGS := -g -O3 -D RELEASE -c -D TARGET_GCW0 -D USES_HOMEDIR -D HOST_NO_REC #-D NO_REND +CXXFLAGS := -g -O3 -D RELEASE -c -D TARGET_GCW0 -D USES_HOMEDIR -D TARGET_NO_REC #-D NO_REND CXXFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant CXXFLAGS += -ffast-math -ftree-vectorize #-fprefetch-loop-arrays diff --git a/shell/mac86/Makefile b/shell/mac86/Makefile index aab1ebf97..0818ec426 100644 --- a/shell/mac86/Makefile +++ b/shell/mac86/Makefile @@ -30,7 +30,7 @@ SOURCES := cfg/ hw/arm7/ hw/aica/ hw/asic/ hw/ hw/gdrom/ hw/maple/ \ hw/extdev/ hw/arm/ imgread/ linux/ linux-dist/ ./ rec-ARM/ deps/zlib/ deps/chdr/ deps/crypto/ arm_emitter/ -CXXFLAGS := -m32 -g -O3 -D RELEASE -c -D TARGET_LINUX_x86 -D HOST_NO_REC -D NO_REND +CXXFLAGS := -m32 -g -O3 -D RELEASE -c -D TARGET_LINUX_x86 -D TARGET_NO_REC -D NO_REND CXXFLAGS += -fno-strict-aliasing CXXFLAGS += -ffast-math -ftree-vectorize #-fprefetch-loop-arrays diff --git a/shell/nacl/Makefile b/shell/nacl/Makefile index 35dc895f8..25a1bc677 100644 --- a/shell/nacl/Makefile +++ b/shell/nacl/Makefile @@ -23,7 +23,7 @@ LDFLAGS:=-lppapi_gles2 -lppapi_cpp -lppapi WARNINGS:=-Wno-long-long -Wswitch-enum CXXFLAGS:=-pthread -std=gnu++0x $(WARNINGS) -CXXFLAGS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos -I../linux-deps/include -D RELEASE -D HOST_NO_REC -D TARGET_NACL32 +CXXFLAGS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos -I../linux-deps/include -D RELEASE -D TARGET_NO_REC -D TARGET_NACL32 # # Compute tool paths