X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=35461804b9d0fb5e6f5c396715dd49a751bf2c58;hb=424e6d52a21bc1b609a964c109d3241232d52eb7;hp=bd26d00ffac1e3b0e7b4a1dc0572e19e9d17606a;hpb=70ffca2435f9ba00c5c9173b3fd2cd0236b1f97b;p=pcsx_rearmed.git

diff --git a/Makefile.libretro b/Makefile.libretro
index bd26d00f..35461804 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -49,12 +49,12 @@ EXTRA_LDFLAGS =
 # select some defaults
 ifneq (,$(findstring $(ARCH_DETECTED),arm aarch64))
 	DYNAREC = ari64
-ifneq ($(findstring __thumb__,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h)),)
+ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'define __thumb__'))
 	# must disable thumb as ari64 can't handle it
 	CFLAGS += -marm
 endif
-ifneq ($(findstring __ARM_NEON,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h)),)
-       BUILTIN_GPU = neon
+ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'HAVE_NEON32'))
+	BUILTIN_GPU = neon
 endif
 endif
 ifneq (,$(findstring $(ARCH_DETECTED),i686 x86_64 aarch64))
@@ -505,7 +505,10 @@ else ifeq ($(platform), emscripten)
 else
 	TARGET := $(TARGET_NAME)_libretro.dll
 	PLATFORM = libretro
-	MAIN_LDFLAGS += -static-libgcc -static-libstdc++ -s
+	MAIN_LDFLAGS += -static-libgcc -static-libstdc++
+ifneq ($(DEBUG),1)
+	MAIN_LDFLAGS += -s
+endif
 	CFLAGS += -D__WIN32__ -DNO_DYLIB
 	MMAP_WIN32=1
 	MAIN_LDLIBS += -lws2_32
@@ -530,7 +533,7 @@ ARCH = $(ARCH_DETECTED)
 endif
 ifndef HAVE_NEON_ASM
 # asm for 32bit only
-HAVE_NEON_ASM = $(shell $(CC) -E -dD $(CFLAGS) - < /dev/null 2> /dev/null | grep -q __ARM_NEON__ && echo 1 || echo 0)
+HAVE_NEON_ASM = $(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep -q HAVE_NEON32 && echo 1 || echo 0)
 endif
 ifeq ($(NO_UNDEF_CHECK)$(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
 MAIN_LDFLAGS += -Wl,--no-undefined