From eab2e01437c1fe8ceb330657ac60663a89a4f2dd Mon Sep 17 00:00:00 2001
From: Ryan 'Swingflip' Hamlin
Date: Wed, 17 Oct 2018 15:14:13 +0100
Subject: Added ARMv7 A7

---
 Makefile | 56 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 18 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index fb4bb75..02d4d21 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ USE_BLARGG_APU        = 0
 LAGFIX                = 1
 
 ifeq ($(platform),)
-	platform = unix
+	ifeq (,$(findstring classic_,$(platform)))
+		platform = unix
+	endif
 ifeq ($(shell uname -a),)
 	platform = win
 else ifneq ($(findstring Darwin,$(shell uname -a)),)
@@ -223,12 +225,38 @@ else ifeq ($(platform), gcw0)
 	LIBM :=
 	LOAD_FROM_MEMORY_TEST = 0
 	CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
-#Nintendo Classics (Hakchi)
-else ifeq ($(platform), nintendoc)
-   TARGET := $(TARGET_NAME)_libretro.so
-   fpic := -fPIC
-   SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
-   CFLAGS += -fno-builtin -fno-exceptions -ffunction-sections  -DARM -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
+		
+# (armv7 a7, hard point, neon based) ### 
+# NESC, SNESC, C64 mini 
+else ifeq ($(platform), classic_armv7_a7)
+	TARGET := $(TARGET_NAME)_libretro.so
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
+	CFLAGS += -Ofast \
+	-flto=4 -fwhole-program -fuse-linker-plugin \
+	-fdata-sections -ffunction-sections -Wl,--gc-sections \
+	-fno-stack-protector -fno-ident -fomit-frame-pointer \
+	-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
+	-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
+	BUILTIN_GPU = neon
+	USE_DYNAREC = 1
+	ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
+	  CFLAGS += -march=armv7-a
+	else
+	  CFLAGS += -march=armv7ve
+	  # If gcc is 5.0 or later
+	  ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
+	    LDFLAGS += -static-libgcc -static-libstdc++
+	  endif
+	endif
+#######################################
 
 # Windows MSVC 2010 x86
 else ifeq ($(platform), windows_msvc2010_x86)
@@ -359,24 +387,16 @@ ifeq ($(platform), theos_ios)
 else
 all: $(TARGET)
 $(TARGET): $(OBJECTS)
+	@echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **"
 ifeq ($(STATIC_LINKING), 1)
 	$(AR) rcs $@ $(OBJECTS)
 else
 	$(CC) $(LINKOUT)$@ $(OBJECTS) $(LDFLAGS) $(LIBS)
 endif
-
-ifeq ($(platform),nintendoc)
-	@echo "** BUILDING HAKCHI HMOD PACKAGE **"
-	mkdir -p hakchi/etc/libretro/core/ hakchi/etc/libretro/info/ hakchi/etc/preinit.d/
-	rm -f hakchi/etc/libretro/info/*
-	cp $(TARGET_NAME)_libretro.so hakchi/etc/libretro/core/
-	cd hakchi/etc/libretro/info/; wget https://buildbot.libretro.com/assets/frontend/info/$(TARGET_NAME)_libretro.info
-	cd hakchi/; tar -czvf "CORE_$(TARGET_NAME).hmod" *
-endif
-
+	@echo "** BUILD SUCCESSFUL! GG NO RE **"
 
 clean:
-	rm -f $(TARGET) $(OBJECTS) hakchi/CORE_$(TARGET_NAME).hmod
+	rm -f $(TARGET) $(OBJECTS)
 
 .PHONY: clean
 endif
-- 
cgit v1.2.3


From 75646227ccf5b32e78cc7a707c5f2e9dd400ca38 Mon Sep 17 00:00:00 2001
From: Ryan 'Swingflip' Hamlin
Date: Mon, 29 Oct 2018 22:26:08 +0000
Subject: Fixed the link for A7A7

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 02d4d21..466d4d1 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,7 @@ else ifeq ($(platform), gcw0)
 else ifeq ($(platform), classic_armv7_a7)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
+	SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
 	CFLAGS += -Ofast \
 	-flto=4 -fwhole-program -fuse-linker-plugin \
 	-fdata-sections -ffunction-sections -Wl,--gc-sections \
-- 
cgit v1.2.3