aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwinaphex2014-10-23 09:36:14 +0200
committertwinaphex2014-10-23 09:36:14 +0200
commitde2a99184b5e478a39a2cb82872d8d5c4af0f3f6 (patch)
tree4698f4cd273439ee57548139fb5f6c3a9d2ca6cd
parenteae1ae02468e1d9d106fd39772a980e5cf3ffb31 (diff)
downloadpcsx_rearmed-de2a99184b5e478a39a2cb82872d8d5c4af0f3f6.tar.gz
pcsx_rearmed-de2a99184b5e478a39a2cb82872d8d5c4af0f3f6.tar.bz2
pcsx_rearmed-de2a99184b5e478a39a2cb82872d8d5c4af0f3f6.zip
Update Makefile
-rw-r--r--Makefile.libretro14
1 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.libretro b/Makefile.libretro
index 7c16422..b92cea4 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