X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=b92cea4a460512c9211bc3fe2fc282a36746013f;hb=52990dd97f8a7abbe5b24d3405f3bcc3ba426e5d;hp=0621d18ef23b6ff53168c285fb90f6ed18f3571c;hpb=9c79adfd39d78c3b615a7ac0ef4ce472439808ce;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index 0621d18e..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
@@ -133,7 +139,7 @@ endif
    ARCH = arm
    USE_DYNAREC = 1
 else
-   TARGET := $(TARGET_NAME)_retro.dll
+   TARGET := $(TARGET_NAME)_libretro.dll
    CC = gcc
    fpic := -fPIC
    LD_FLAGS := -fPIC