From: T. Joseph Carter Date: Thu, 12 Mar 2015 11:46:35 +0000 (-0700) Subject: Generate dynarec AND interpreter on iOS (with single invocation!) X-Git-Tag: r24l~884^2 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbf0ed57061c71631e958167be554cbea3f3c554;hp=--cc;p=pcsx_rearmed.git Generate dynarec AND interpreter on iOS (with single invocation!) --- cbf0ed57061c71631e958167be554cbea3f3c554 diff --git a/Makefile.libretro b/Makefile.libretro index 70a7c141..1efb7f91 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -56,7 +56,12 @@ else ifeq ($(platform), osx) # iOS else ifeq ($(platform), ios) ARCH := arm + USE_DYNAREC ?= 1 TARGET := $(TARGET_NAME)_libretro_ios.dylib +ifeq ($(USE_DYNAREC),0) + # Override + TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib +endif fpic := -fPIC SHARED := -dynamiclib @@ -71,7 +76,6 @@ else ifeq ($(platform), ios) ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon HAVE_NEON = 1 BUILTIN_GPU = neon - USE_DYNAREC = 1 CFLAGS += -DIOS OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` @@ -201,6 +205,14 @@ SOUND_DRIVERS = libretro PLUGINS = NO_CONFIG_MAK = yes +libretro_all: all +ifeq ($(platform),ios) +ifeq ($(USE_DYNAREC),1) + make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform) clean + make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform) +endif +endif + include Makefile # no special AS needed for gpu_neon