make: switch apple platforms to neon gpu too

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index e17f296..f40f816 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -72,6 +72,8 @@ else ifneq (,$(findstring CortexA73_G12B,$(platform)))
        fpic := -fPIC
        SHARED := -shared -Wl,-version-script=link.T
        ARCH = arm64
+       BUILTIN_GPU = neon
+       HAVE_NEON = 1
        DYNAREC = ari64
        CFLAGS += -fomit-frame-pointer -ffast-math -DARM
        CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
@@ -82,6 +84,8 @@ else ifneq (,$(findstring h5,$(platform)))
        fpic := -fPIC
        SHARED := -shared -Wl,-version-script=link.T
        ARCH = arm64
+       BUILTIN_GPU = neon
+       HAVE_NEON = 1
        DYNAREC = ari64
        CFLAGS += -fomit-frame-pointer -ffast-math -DARM
        CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a53 -mtune=cortex-a53
@@ -141,14 +145,15 @@ ifeq ($(platform),ios-arm64)
         CC = cc -arch arm64 -isysroot $(IOSSDK)
        CXX = c++ -arch arm64 -isysroot $(IOSSDK)
        ARCH := arm64
-       HAVE_NEON = 0
-       BUILTIN_GPU = peops
+       BUILTIN_GPU = neon
+       HAVE_NEON = 1
        DYNAREC = 0
 else
        CC = cc -arch armv7 -isysroot $(IOSSDK)
        CXX = c++ -arch armv7 -isysroot $(IOSSDK)
        ARCH := arm
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        BUILTIN_GPU = neon
        CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
        ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
@@ -178,8 +183,8 @@ endif
         CC = cc -arch arm64 -isysroot $(IOSSDK)
        CXX = c++ -arch arm64 -isysroot $(IOSSDK)
        ARCH := arm64
-       HAVE_NEON = 0
-       BUILTIN_GPU = peops
+       BUILTIN_GPU = neon
+       HAVE_NEON = 1
        DYNAREC = 0
        CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
 
@@ -189,24 +194,26 @@ else ifeq ($(platform), libnx)
    include $(DEVKITPRO)/libnx/switch_rules
    TARGET := $(TARGET_NAME)_libretro_$(platform).a
    ARCH := arm64
-   BUILTIN_GPU = unai
    HAVE_VFS_FD = 0
    CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(DEVKITPRO)/libnx/include/ -fPIE -Wl,--allow-multiple-definition # -include $(LIBNX)/include/switch.h
    CFLAGS += -specs=$(DEVKITPRO)/libnx/switch.specs -DNO_OS -DNO_DYLIB -DNO_SOCKET -D__arm64__ -D__ARM_NEON__
-   CFLAGS += -D__SWITCH__
+   CFLAGS += -D__SWITCH__ -DHAVE_LIBNX
    CFLAGS += -DARM -D__aarch64__=1 -march=armv8-a -mtune=cortex-a57 -mtp=soft -DHAVE_INTTYPES -DLSB_FIRST -ffast-math -mcpu=cortex-a57+crc+fp+simd -ffunction-sections
    CFLAGS += -ftree-vectorize
    CFLAGS += -Ifrontend/switch -ftree-vectorize
    LIBPTHREAD :=
    STATIC_LINKING=1
+   BUILTIN_GPU = neon
+   HAVE_NEON = 1
    DYNAREC = ari64
 
 # Lakka Switch (arm64)
 else ifeq ($(platform), arm64)
    TARGET := $(TARGET_NAME)_libretro.so
    ARCH := arm64
+   BUILTIN_GPU = neon
+   HAVE_NEON = 1
    DYNAREC = ari64
-   BUILTIN_GPU = unai
    fpic := -fPIC
    CFLAGS := $(filter-out -O2, $(CFLAGS))
    CFLAGS += -O3 -ftree-vectorize
@@ -241,6 +248,7 @@ else ifeq ($(platform), vita)
 
 #      CFLAGS += -U__ARM_NEON__
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        BUILTIN_GPU = neon
 
        DYNAREC = ari64
@@ -299,6 +307,7 @@ else ifeq ($(platform), qnx)
        CC = qcc -Vgcc_ntoarmv7le
        CC_AS = $(CC)
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        DYNAREC = ari64
        BUILTIN_GPU = neon
        ARCH = arm
@@ -327,6 +336,7 @@ else ifeq ($(platform), rpi2)
        CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
        ASFLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        ARCH = arm
        BUILTIN_GPU = neon
        DYNAREC = ari64
@@ -338,6 +348,7 @@ else ifeq ($(platform), rpi3)
        CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
        ASFLAGS += -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        ARCH = arm
        BUILTIN_GPU = neon
        DYNAREC = ari64
@@ -346,7 +357,8 @@ else ifeq ($(platform), rpi3)
 else ifeq ($(platform), rpi3_64)
        TARGET := $(TARGET_NAME)_libretro.so
        ARCH := arm64
-       BUILTIN_GPU = unai
+       BUILTIN_GPU = neon
+       HAVE_NEON = 1
        DYNAREC = ari64
        fpic := -fPIC
        CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a53 -ftree-vectorize
@@ -358,6 +370,7 @@ else ifeq ($(platform), rpi4)
        CFLAGS += -marm -mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard
        ASFLAGS += -mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        ARCH = arm
        BUILTIN_GPU = neon
        DYNAREC = ari64
@@ -366,8 +379,9 @@ else ifeq ($(platform), rpi4)
 else ifeq ($(platform), rpi4_64)
         TARGET := $(TARGET_NAME)_libretro.so
         ARCH := arm64
-        BUILTIN_GPU = unai
-       DYNAREC = ari64
+        BUILTIN_GPU = neon
+        HAVE_NEON = 1
+        DYNAREC = ari64
         fpic := -fPIC
         CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72 -ftree-vectorize
 
@@ -392,6 +406,7 @@ else ifeq ($(platform), classic_armv7_a7)
        CPPFLAGS += $(CFLAGS)
        ASFLAGS += $(CFLAGS)
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        ARCH = arm
        BUILTIN_GPU = neon
        DYNAREC = ari64
@@ -414,6 +429,7 @@ else ifeq ($(platform), classic_armv8_a35)
        -fmerge-all-constants -fno-math-errno -march=armv8-a \
        -marm -mcpu=cortex-a35 -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
        HAVE_NEON = 1
+       HAVE_NEON_ASM = 1
        ARCH = arm
        BUILTIN_GPU = neon
        DYNAREC = ari64
@@ -443,6 +459,7 @@ else ifneq (,$(findstring armv,$(platform)))
                CFLAGS += -mfpu=neon
                ASFLAGS += -mfpu=neon
                HAVE_NEON = 1
+               HAVE_NEON_ASM = 1
                BUILTIN_GPU = neon
        endif
        ifneq (,$(findstring softfloat,$(platform)))