From ac86f05170b9b686a016dad0945311326be0cd7a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 23 Oct 2014 09:36:14 +0200 Subject: [PATCH] libretro: Update Makefile Conflicts: Makefile.libretro --- Makefile.libretro | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index 9c8a7579..d92b9ade 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -29,8 +29,9 @@ else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib -OSXVER = `sw_vers -productVersion | cut -c 4` -ifneq ($(OSXVER),9) + OSXVER = `sw_vers -productVersion | cut -d. -f 2` + OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` +ifeq ($(OSX_LT_MAVERICKS),"YES") fpic += -mmacosx-version-min=10.5 endif else ifeq ($(platform), ios) @@ -39,6 +40,10 @@ ARCH := arm fpic := -fPIC SHARED := -dynamiclib +ifeq ($(IOSSDK),) + IOSSDK := $(shell xcrun -sdk iphoneos -show-sdk-path) +endif + CC = clang -arch armv7 -isysroot $(IOSSDK) CXX = clang++ -arch armv7 -isysroot $(IOSSDK) CC_AS = perl ./tools/gas-preprocessor.pl $(CC) @@ -48,8 +53,9 @@ ARCH := arm BUILTIN_GPU = neon USE_DYNAREC = 1 CFLAGS += -DIOS -OSXVER = `sw_vers -productVersion | cut -c 4` -ifneq ($(OSXVER),9) + OSXVER = `sw_vers -productVersion | cut -d. -f 2` + OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` +ifeq ($(OSX_LT_MAVERICKS),"YES") CC += -miphoneos-version-min=5.0 CXX += -miphoneos-version-min=5.0 CC_AS += -miphoneos-version-min=5.0 -- 2.39.5