Merge pull request #33 from dankcushions/master

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index de2bceb..ee1449e 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)
@@ -119,31 +122,37 @@ else ifeq ($(platform), vita)
        AR = arm-vita-eabi-ar$(EXE_EXT)
        CFLAGS += -DVITA
        CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
+       CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
+       CFLAGS += -DNO_SOCKET -DNO_OS -DNO_DYLIB
        ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+
+#   CFLAGS += -U__ARM_NEON__
        HAVE_NEON = 1
        BUILTIN_GPU = neon
 
+#   USE_DYNAREC = 1
+#      DRC_CACHE_BASE = 0
+
+       ARCH = arm
+   STATIC_LINKING = 1
+
 # CTR(3DS)
 else ifeq ($(platform), ctr)
        TARGET := $(TARGET_NAME)_libretro_ctr.a
        CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
        CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
        AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
-       CFLAGS += -DARM11 -D_3DS -DNO_OS
-       CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp
+       CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET
+       CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
        CFLAGS += -Wall -mword-relocations
        CFLAGS += -fomit-frame-pointer -ffast-math      
-       CFLAGS += -I$(CTRULIB)/include -I$(DEVKITPRO)/portlibs/armv6k/include -Ifrontend/3ds
+       CFLAGS += -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
-
-
 #      CFLAGS += -DPCSX
 #      BUILTIN_GPU = unai
        USE_DYNAREC = 1
-       DRC_CACHE_BASE = 0
+       DRC_CACHE_BASE = 1
        ARCH = arm
 
        STATIC_LINKING = 1
@@ -172,6 +181,7 @@ else ifeq ($(platform), wii)
 # QNX
 else ifeq ($(platform), qnx)
        TARGET := $(TARGET_NAME)_libretro_qnx.so
+   fpic := -fPIC
        CC = qcc -Vgcc_ntoarmv7le
        CC_AS = $(CC)
        HAVE_NEON = 1
@@ -186,6 +196,7 @@ else ifeq ($(platform), qnx)
 else ifneq (,$(findstring armv,$(platform)))
        TARGET := $(TARGET_NAME)_libretro.so
        SHARED := -shared -Wl,--no-undefined
+       fpic := -fPIC
        DRC_CACHE_BASE = 0
        ifneq (,$(findstring cortexa8,$(platform)))
                CFLAGS += -marm -mcpu=cortex-a8
@@ -222,7 +233,7 @@ else
        MMAP_WIN32=1
 endif
 
-CFLAGS += -fPIC
+CFLAGS += $(fpic)
 ifeq ($(platform),win)
        MAIN_LDLIBS += -lws2_32
 else ifneq ($(platform),qnx)