From 9795f2cd889e10510c9dc14ddf8198a0f45f8363 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Wed, 22 Feb 2017 00:11:27 +0100
Subject: [PATCH] Add staticios target (for iOS 8 and later)

---
 Makefile.libretro | 56 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index b2ccc415..d1a75029 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -73,6 +73,33 @@ else ifeq ($(platform), osx)
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
 	SHARED += -mmacosx-version-min=10.1
 
+else ifeq ($(platform), staticios)
+	TARGET := $(TARGET_NAME)_libretro_ios.a
+	APPLE := 1
+	ifeq ($(IOSSDK),)
+		IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+	endif
+	CC = clang -arch armv7 -isysroot $(IOSSDK)
+	CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+	CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
+	CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 
+	ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+	CFLAGS += -DIOS
+
+	CC     += -miphoneos-version-min=8.0
+	CXX    += -miphoneos-version-min=8.0
+	CC_AS  += -miphoneos-version-min=8.0
+	CFLAGS += -miphoneos-version-min=8.0
+	ARCH := arm
+
+	STATIC_LINKING = 1
+	use_cyclone = 0
+	use_fame = 1
+	use_drz80 = 0
+	use_cz80 = 1
+	use_sh2drc = 1
+	use_svpdrc = 1
+
 # iOS
 else ifneq (,$(findstring ios,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
@@ -109,35 +136,6 @@ endif
 	use_sh2drc = 1
 	use_svpdrc = 1
 
-else ifneq (,$(findstring ios_static,$(platform)))
-	TARGET := $(TARGET_NAME)_libretro_ios.a
-	SHARED := -dynamiclib
-   fpic := -fPIC
-	APPLE := 1
-	ifeq ($(IOSSDK),)
-		IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
-	endif
-	CC = clang -arch armv7 -isysroot $(IOSSDK)
-	CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
-	CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-	CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 
-	ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
-	CFLAGS += -DIOS
-
-	CC     += -miphoneos-version-min=8.0
-	CXX    += -miphoneos-version-min=8.0
-	CC_AS  += -miphoneos-version-min=8.0
-	CFLAGS += -miphoneos-version-min=8.0
-	ARCH := arm
-
-	STATIC_LINKING = 1
-	use_cyclone = 0
-	use_fame = 1
-	use_drz80 = 0
-	use_cz80 = 1
-	use_sh2drc = 1
-	use_svpdrc = 1
-
 # PS3
 else ifeq ($(platform), ps3)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a