X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=8f48a32c25cb861252b7fd507f07c5af8e53aba1;hb=7aba2372d721604ae1edccb49528b3dce1491d85;hp=22fa7e80a99e994892d68a1ecff2eb83aa53969c;hpb=9f2c632c7c04c7c86cf66ba3210b43c3e8394e48;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index 22fa7e80..8f48a32c 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -4,6 +4,9 @@ DEBUG ?= 0
 WANT_ZLIB ?= 1
 HAVE_CHD ?= 1
 
+# Dynarec options: lightrec, ari64
+DYNAREC ?= lightrec
+
 ifeq ($(platform),)
 	platform = unix
 	ifeq ($(shell uname -a),)
@@ -67,21 +70,17 @@ else ifeq ($(platform), linux-portable)
 
 # OS X
 else ifeq ($(platform), osx)
-	USE_DYNAREC ?= 1
+	DYNAREC ?= lightrec
 	TARGET := $(TARGET_NAME)_libretro.dylib
 	fpic := -fPIC
 	fpic += -mmacosx-version-min=10.1
-ifeq ($(USE_DYNAREC),0)
-	# Override
-	TARGET := $(TARGET_NAME)_interpreter_libretro.dylib
-endif
 
 # iOS
 else ifeq ($(platform),$(filter $(platform),ios-arm64))
 	ARCH := arm64
-	USE_DYNAREC = 0
 	HAVE_NEON = 0
 	BUILTIN_GPU = peops
+	DYNAREC = 0
 	TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
 
 	CC = clang -arch arm64 -isysroot $(IOSSDK) -miphoneos-version-min=8.0
@@ -90,12 +89,13 @@ else ifeq ($(platform),$(filter $(platform),ios-arm64))
 
 else ifneq (,$(findstring ios,$(platform)))
 	ARCH := arm
-	USE_DYNAREC ?= 1
+	DYNAREC ?= ari64
 	HAVE_NEON = 1
 	BUILTIN_GPU = neon
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
-ifeq ($(USE_DYNAREC),0)
+ifeq ($(DYNAREC),lightrec)
 	# Override
+	DYNAREC = 0
 	TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
 endif
 	fpic := -fPIC
@@ -137,7 +137,6 @@ else ifeq ($(platform), libnx)
    CFLAGS += -ftree-vectorize
    CFLAGS += -Ifrontend/switch -ftree-vectorize
    LIBPTHREAD :=
-   USE_DYNAREC = 0
    STATIC_LINKING=1
 
 # Lakka Switch (arm64)
@@ -148,7 +147,6 @@ else ifeq ($(platform), arm64)
    fpic := -fPIC
    CFLAGS := $(filter-out -O2, $(CFLAGS))
    CFLAGS += -O3 -ftree-vectorize
-   USE_DYNAREC = 0
 
 # PS3
 else ifeq ($(platform), ps3)
@@ -196,7 +194,7 @@ else ifeq ($(platform), vita)
 	HAVE_NEON = 1
 	BUILTIN_GPU = neon
 
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 	DRC_CACHE_BASE = 0
 
 	ARCH = arm
@@ -208,16 +206,18 @@ else ifeq ($(platform), ctr)
 	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 -DNO_DYLIB -DNO_SOCKET
+	CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
 	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 -funroll-loops
 	CFLAGS += -Ifrontend/3ds
 	CFLAGS += -Werror=implicit-function-declaration
 
+	OBJS += frontend/3ds/utils.o
+
 #	CFLAGS += -DPCSX
 	BUILTIN_GPU = unai
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 	DRC_CACHE_BASE = 0
 	ARCH = arm
 	HAVE_NEON = 0
@@ -251,7 +251,7 @@ else ifeq ($(platform), qnx)
 	CC = qcc -Vgcc_ntoarmv7le
 	CC_AS = $(CC)
 	HAVE_NEON = 1
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 	DRC_CACHE_BASE = 0
 	BUILTIN_GPU = neon
 	ARCH = arm
@@ -271,7 +271,7 @@ else ifeq ($(platform), rpi2)
 	HAVE_NEON = 1
 	ARCH = arm
 	BUILTIN_GPU = neon
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 
 #Raspberry Pi 3
 else ifeq ($(platform), rpi3)
@@ -282,7 +282,7 @@ else ifeq ($(platform), rpi3)
 	HAVE_NEON = 1
 	ARCH = arm
 	BUILTIN_GPU = neon
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 
 #Raspberry Pi 4
 else ifeq ($(platform), rpi4)
@@ -293,7 +293,7 @@ else ifeq ($(platform), rpi4)
 	HAVE_NEON = 1
 	ARCH = arm
 	BUILTIN_GPU = neon
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 
 # Classic Platforms ####################
 # Platform affix = classic_<ISA>_<µARCH>
@@ -318,7 +318,7 @@ else ifeq ($(platform), classic_armv7_a7)
 	HAVE_NEON = 1
 	ARCH = arm
 	BUILTIN_GPU = neon
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 	ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
 		CFLAGS += -march=armv7-a
 	else
@@ -340,7 +340,7 @@ else ifeq ($(platform), classic_armv8_a35)
 	HAVE_NEON = 1
 	ARCH = arm
 	BUILTIN_GPU = neon
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 	LDFLAGS += -static-libgcc -static-libstdc++ -fPIC
 
 #######################################
@@ -378,7 +378,7 @@ else ifneq (,$(findstring armv,$(platform)))
 		ASFLAGS += -mfloat-abi=hard
 	endif
 	ARCH = arm
-	USE_DYNAREC = 1
+	DYNAREC = ari64
 
 # Windows
 else
@@ -424,9 +424,9 @@ NO_CONFIG_MAK = yes
 # what does this do
 #libretro_all: all
 #ifeq ($(platform),ios)
-#ifeq ($(USE_DYNAREC),1)
-#	make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform) clean
-#	make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform)
+#ifeq ($(DYNAREC),1)
+#	make -f Makefile.libretro DYNAREC=0 platform=$(platform) clean
+#	make -f Makefile.libretro DYNAREC=0 platform=$(platform)
 #endif
 #endif