Merge pull request #151 from kwyxz/master

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index fb13657..a82a13a 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -36,6 +36,9 @@ EXTRA_LDFLAGS =
 ifeq ($(platform), unix)
        TARGET := $(TARGET_NAME)_libretro.so
        fpic := -fPIC
+ifneq ($(findstring SunOS,$(shell uname -a)),)
+       CC = gcc
+endif
 
 else ifeq ($(platform), linux-portable)
        TARGET := $(TARGET_NAME)_libretro.so
@@ -53,11 +56,20 @@ else ifeq ($(platform), osx)
        fpic += -mmacosx-version-min=10.1
 
 # iOS
+else ifeq ($(platform),$(filter $(platform),ios-arm64))
+    ARCH := arm64
+    USE_DYNAREC = 0
+    HAVE_NEON = 0
+    BUILTIN_GPU = peops
+    TARGET := $(TARGET_NAME)_libretro_ios.dylib
+
 else ifneq (,$(findstring ios,$(platform)))
        ARCH := arm
        USE_DYNAREC ?= 1
+    HAVE_NEON = 1
+    BUILTIN_GPU = neon
        TARGET := $(TARGET_NAME)_libretro_ios.dylib
-ifeq ($(USE_DYNAREC),0)
+ifeq ($(USE_DYNAREC),1)
        # Override
        TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
 endif
@@ -72,8 +84,6 @@ endif
        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
-       HAVE_NEON = 1
-       BUILTIN_GPU = neon
        CFLAGS += -DIOS
 ifeq ($(platform),ios9)
        CC     += -miphoneos-version-min=8.0
@@ -122,7 +132,7 @@ else ifeq ($(platform), vita)
        AR = arm-vita-eabi-ar$(EXE_EXT)
        CFLAGS += -DVITA
        CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
-       CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables 
+       CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables
        CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
        CFLAGS +=  -fno-optimize-sibling-calls
        CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
@@ -148,7 +158,7 @@ else ifeq ($(platform), ctr)
        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 += -fomit-frame-pointer -ffast-math
        CFLAGS += -Ifrontend/3ds
        CFLAGS += -Werror=implicit-function-declaration
 
@@ -209,7 +219,7 @@ else ifeq ($(platform), rpi2)
        ARCH = arm
        BUILTIN_GPU = neon
        USE_DYNAREC = 1
-       
+
 #Raspberry Pi 3
 else ifeq ($(platform), rpi3)
        TARGET := $(TARGET_NAME)_libretro.so
@@ -256,7 +266,7 @@ else
    BUILTIN_GPU = peops
    PLATFORM = libretro
        MAIN_LDFLAGS += -static-libgcc -static-libstdc++ -s
-       CFLAGS += -D__WIN32__ -DNO_DYLIB 
+       CFLAGS += -D__WIN32__ -DNO_DYLIB
        MMAP_WIN32=1
        MAIN_LDLIBS += -lws2_32
        LIBPTHREAD :=