From 3c5dd789610b7c488c04285bc022b218b7b31c8c Mon Sep 17 00:00:00 2001
From: Ryan 'Swingflip' Hamlin
Date: Tue, 26 Jun 2018 13:09:55 +0100
Subject: Added Hakchi Platform

---
 Makefile | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e51d126..8396886 100644
--- a/Makefile
+++ b/Makefile
@@ -223,6 +223,12 @@ 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,--version-script=libretro/link.T -Wl,--no-undefined
+   CFLAGS += -DARM -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
 
 # Windows MSVC 2010 x86
 else ifeq ($(platform), windows_msvc2010_x86)
@@ -339,6 +345,15 @@ else
 	LD = $(CC)
 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
+
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
 
@@ -360,7 +375,7 @@ else
 endif
 
 clean:
-	rm -f $(TARGET) $(OBJECTS)
+	rm -f $(TARGET) $(OBJECTS) hakchi/CORE_$(TARGET_NAME).hmod
 
 .PHONY: clean
 endif
-- 
cgit v1.2.3


From 736b1d09038217ee7793f7544973cca88f373c43 Mon Sep 17 00:00:00 2001
From: Ryan 'Swingflip' Hamlin
Date: Tue, 26 Jun 2018 13:11:35 +0100
Subject: derped the make.

---
 Makefile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8396886..f12da07 100644
--- a/Makefile
+++ b/Makefile
@@ -345,15 +345,6 @@ else
 	LD = $(CC)
 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
-
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
 
@@ -374,6 +365,16 @@ 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
+
+
 clean:
 	rm -f $(TARGET) $(OBJECTS) hakchi/CORE_$(TARGET_NAME).hmod
 
-- 
cgit v1.2.3


From fe2ac60ef67f03b8e4bb6caeca49653bcf803343 Mon Sep 17 00:00:00 2001
From: Ryan 'Swingflip' Hamlin
Date: Tue, 26 Jun 2018 13:24:33 +0100
Subject: 3rd time lucky with the make...

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f12da07..fb4bb75 100644
--- a/Makefile
+++ b/Makefile
@@ -227,8 +227,8 @@ else ifeq ($(platform), gcw0)
 else ifeq ($(platform), nintendoc)
    TARGET := $(TARGET_NAME)_libretro.so
    fpic := -fPIC
-   SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
-   CFLAGS += -DARM -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
+   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
 
 # Windows MSVC 2010 x86
 else ifeq ($(platform), windows_msvc2010_x86)
-- 
cgit v1.2.3