From: twinaphex Date: Thu, 23 Oct 2014 07:36:14 +0000 (+0200) Subject: Update Makefile X-Git-Tag: r24l~903 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2a99184b5e478a39a2cb82872d8d5c4af0f3f6;p=pcsx_rearmed.git Update Makefile --- diff --git a/Makefile.libretro b/Makefile.libretro index 7c164228..b92cea4a 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -33,8 +33,9 @@ else ifeq ($(platform), osx) SHARED := -dynamiclib BUILTIN_GPU = neon CFLAGS += -DNEON_PC -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) @@ -43,6 +44,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) @@ -52,8 +57,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