Revert "Hide nonfunctional NEON options in aarch64"

[pcsx_rearmed.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index d29676d..a8c8c4a 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,6 +1,7 @@
 # Makefile for PCSX ReARMed (libretro)
 
 DEBUG=0
+WANT_ZLIB=1
 
 ifeq ($(platform),)
        platform = unix
@@ -26,7 +27,9 @@ GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
 ifneq ($(GIT_VERSION)," unknown")
        CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
+ifneq ($(WANT_ZLIB),1)
 LIBZ := -lz
+endif
 LIBPTHREAD := -lpthread
 ifneq ($(findstring Haiku,$(shell uname -s)),)
 LIBDL := -lroot -lnetwork
@@ -237,6 +240,7 @@ else ifeq ($(platform), rpi3)
 
 # Classic Platforms ####################
 # Platform affix = classic_<ISA>_<µARCH>
+# Help at https://modmyclassic.com/comp
 
 # (armv7 a7, hard point, neon based) ### 
 # NESC, SNESC, C64 mini 
@@ -251,6 +255,8 @@ else ifeq ($(platform), classic_armv7_a7)
        -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
        -fmerge-all-constants -fno-math-errno \
        -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
+       CXXFLAGS += $(CFLAGS)
+       CPPFLAGS += $(CFLAGS)
        ASFLAGS += $(CFLAGS)
        HAVE_NEON = 1
        ARCH = arm
@@ -262,11 +268,9 @@ else ifeq ($(platform), classic_armv7_a7)
          CFLAGS += -march=armv7ve
          # If gcc is 5.0 or later
          ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
-           MAIN_LDFLAGS += -static-libgcc -static-libstdc++
+           LDFLAGS += -static-libgcc -static-libstdc++
          endif
        endif
-
-
 #######################################
 
 # ARM