From 54c1a1e8c284ede3e0da887ec4ce088f78f7fc30 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 23 Oct 2014 09:35:23 +0200 Subject: [PATCH] Update Makefile --- Makefile.libretro | 14 ++++++++++---- cpu/cyclone | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index 271d6045..8a4d57a5 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -50,8 +50,9 @@ endif ifeq ($(arch),ppc) CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS endif -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") SHARED += -mmacosx-version-min=10.5 endif else ifeq ($(platform), ios) @@ -59,14 +60,19 @@ else ifeq ($(platform), ios) SHARED := -dynamiclib APPLE := 1 +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) CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon 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 diff --git a/cpu/cyclone b/cpu/cyclone index 590d780f..355815eb 160000 --- a/cpu/cyclone +++ b/cpu/cyclone @@ -1 +1 @@ -Subproject commit 590d780f20871b29fdc803bd2c74b046fd2d0f28 +Subproject commit 355815ebb5b1c60916f66d043a43f3af7839589f -- 2.39.5