initial neGcon controller support

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index 7122306..2b2a362 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -52,7 +52,7 @@ else ifeq ($(platform), osx)
        fpic += -mmacosx-version-min=10.1
 
 # iOS
-else ifeq ($(platform), ios)
+else ifneq (,$(findstring ios,$(platform)))
        ARCH := arm
        USE_DYNAREC ?= 1
        TARGET := $(TARGET_NAME)_libretro_ios.dylib
@@ -75,14 +75,17 @@ endif
        HAVE_NEON = 1
        BUILTIN_GPU = neon
        CFLAGS += -DIOS
-       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
-               CFLAGS += -miphoneos-version-min=5.0
-       endif
+ifeq ($(platform),ios9)
+       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
+else
+       CC     += -miphoneos-version-min=5.0
+       CXX    += -miphoneos-version-min=5.0
+       CC_AS  += -miphoneos-version-min=5.0
+       CFLAGS += -miphoneos-version-min=5.0
+endif
 
 # PS3
 else ifeq ($(platform), ps3)
@@ -146,8 +149,7 @@ else ifeq ($(platform), ctr)
        CFLAGS += -I$(CTRULIB)/include -I$(DEVKITPRO)/portlibs/armv6k/include -Ifrontend/3ds
        CFLAGS += -Werror=implicit-function-declaration
 
-       CXXFLAGS += -fno-rtti -fno-exceptions -std=gnu++11
-       OBJS += frontend/3ds/3ds_utils.o frontend/3ds/libkhax/khaxinit.o
+       OBJS += frontend/3ds/3ds_utils.o
 
 
 #      CFLAGS += -DPCSX