From 426033b4d19b3019c9618be3b0a8cbc9f370a286 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 15 Oct 2015 16:14:25 +0200
Subject: [PATCH] Set up libretro-test Makefiles for iOS 9

---
 cores/libretro-test-gl/Makefile | 16 ++++++++++++++--
 cores/libretro-test/Makefile    | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/cores/libretro-test-gl/Makefile b/cores/libretro-test-gl/Makefile
index cf86540aa9..185db56972 100644
--- a/cores/libretro-test-gl/Makefile
+++ b/cores/libretro-test-gl/Makefile
@@ -60,14 +60,26 @@ else ifeq ($(platform), pi)
    CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/vmcs_host/linux
    GLES := 1
    LIBS += -L/opt/vc/lib
-else ifeq ($(platform), ios)
+else ifneq (,$(findstring ios,$(platform)))
    TARGET := $(TARGET_NAME)_libretro_ios.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
+
+ifeq ($(IOSSDK),)
+   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+endif
+
    GL_LIB := -framework OpenGLES
    DEFINES := -DIOS
    CFLAGS += -DGLES $(DEFINES)
-   CC = clang -arch armv7 -isysroot $(IOSSDK)
+   CC = cc -arch armv7 -isysroot $(IOSSDK)
+ifeq ($(platform),ios9)
+	CC     += -miphoneos-version-min=8.0
+	CFLAGS += -miphoneos-version-min=8.0
+else
+	CC     += -miphoneos-version-min=5.0
+	CFLAGS += -miphoneos-version-min=5.0
+endif
 else ifneq (,$(findstring qnx,$(platform)))
    TARGET := $(TARGET_NAME)_libretro_qnx.so
    fpic := -fPIC
diff --git a/cores/libretro-test/Makefile b/cores/libretro-test/Makefile
index 8fee362f91..3049031b58 100644
--- a/cores/libretro-test/Makefile
+++ b/cores/libretro-test/Makefile
@@ -42,12 +42,24 @@ else ifneq (,$(findstring osx,$(platform)))
    TARGET := $(TARGET_NAME)_libretro.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
-else ifeq ($(platform), ios)
+else ifneq (,$(findstring ios,$(platform)))
    TARGET := $(TARGET_NAME)_libretro_ios.dylib
 	fpic := -fPIC
 	SHARED := -dynamiclib
+
+ifeq ($(IOSSDK),)
+   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+endif
+
 	DEFINES := -DIOS
-	CC = clang -arch armv7 -isysroot $(IOSSDK)
+	CC = cc -arch armv7 -isysroot $(IOSSDK)
+ifeq ($(platform),ios9)
+CC     += -miphoneos-version-min=8.0
+CFLAGS += -miphoneos-version-min=8.0
+else
+CC     += -miphoneos-version-min=5.0
+CFLAGS += -miphoneos-version-min=5.0
+endif
 else ifneq (,$(findstring qnx,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro_qnx.so
    fpic := -fPIC