X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Makefile.libretro;h=e9df3455dedf3684ffd3489fb8bea7a989238a6b;hb=07ade526c4a0b1ddb316aff1459c1bdff31c267a;hp=dd896820657c16434636a99006f5af66332a2a71;hpb=edbb8178300717f1597ab41e62722e5683c39028;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index dd896820..e9df3455 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -51,6 +51,9 @@ ifeq ($(platform), unix)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
 	THREAD_RENDERING = 1
+ifeq ($(shell uname),Linux)
+	LIGHTREC_CUSTOM_MAP := 1
+endif
 ifneq ($(findstring SunOS,$(shell uname -s)),)
 	CC = gcc
 endif
@@ -69,7 +72,7 @@ else ifneq (,$(findstring CortexA73_G12B,$(platform)))
 	fpic := -fPIC
 	SHARED := -shared -Wl,-version-script=link.T
 	ARCH = arm64
-	DYNAREC ?= ari64
+	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
 
@@ -79,7 +82,7 @@ else ifneq (,$(findstring h5,$(platform)))
 	fpic := -fPIC
 	SHARED := -shared -Wl,-version-script=link.T
 	ARCH = arm64
-	DYNAREC ?= ari64
+	DYNAREC = ari64
 	CFLAGS += -fomit-frame-pointer -ffast-math -DARM
 	CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a53 -mtune=cortex-a53
 
@@ -92,6 +95,7 @@ else ifeq ($(platform), linux-portable)
 	LIBDL :=
 	LIBM :=
 	NO_UNDEF_CHECK = 1
+	LIGHTREC_CUSTOM_MAP := 1
 
 # OS X
 else ifeq ($(platform), osx)
@@ -145,6 +149,7 @@ else
 	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
@@ -187,16 +192,15 @@ else ifeq ($(platform), libnx)
    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 += -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
-   # Lightning requires rw/rx patches first
-   DYNAREC := 0
+   DYNAREC = ari64
 
 # Lakka Switch (arm64)
 else ifeq ($(platform), arm64)
@@ -238,6 +242,7 @@ else ifeq ($(platform), vita)
 
 #	CFLAGS += -U__ARM_NEON__
 	HAVE_NEON = 1
+	HAVE_NEON_ASM = 1
 	BUILTIN_GPU = neon
 
 	DYNAREC = ari64
@@ -296,6 +301,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
@@ -324,6 +330,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
@@ -335,6 +342,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
@@ -355,6 +363,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
@@ -389,6 +398,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
@@ -411,6 +421,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
@@ -440,6 +451,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)))