X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile.libretro;h=a8f63faa6dba214d626dff5cd90e1a1423abb09b;hp=1dbacd5506f87e1093029b2ac892acbe541ac5bf;hb=4e47706596441172d1cc3f203b8baa398cea3023;hpb=c7ed243f7ab63e4fd9c314e148e2f367b17e4f0b;ds=sidebyside

diff --git a/Makefile.libretro b/Makefile.libretro
index 1dbacd55..a8f63faa 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -21,6 +21,8 @@ CFLAGS ?=
 
 TARGET_NAME := pcsx_rearmed
 
+MMAP_WIN32=0
+
 ifeq ($(platform), unix)
    TARGET := $(TARGET_NAME)_libretro.so
    fpic := -fPIC
@@ -29,8 +31,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 +42,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 +55,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
@@ -129,12 +137,13 @@ endif
    ARCH = arm
    USE_DYNAREC = 1
 else
-   TARGET := $(TARGET_NAME)_retro.dll
+   TARGET := $(TARGET_NAME)_libretro.dll
    CC = gcc
    fpic := -fPIC
    LD_FLAGS := -fPIC
    SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libretro/link.T
    CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
+   MMAP_WIN32=1
 endif
 
 CFLAGS += -fPIC