From a8cb30b9c5f91b85a18651c74163a5b4bcdcfeb5 Mon Sep 17 00:00:00 2001
From: Ryan 'Swingflip' Hamlin <ryan@ryanhamlin.co.uk>
Date: Tue, 23 Oct 2018 17:16:15 +0100
Subject: [PATCH] Static compiling of ARMv7 CortexA7

---
 Makefile.classic_armv7_a7 | 12 +++++++++++-
 Makefile.common           |  5 +++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Makefile.classic_armv7_a7 b/Makefile.classic_armv7_a7
index 0413cdb45b..eb04fde2f5 100644
--- a/Makefile.classic_armv7_a7
+++ b/Makefile.classic_armv7_a7
@@ -3,7 +3,6 @@
 # ensure the SDL2 link isn't broken...
 
 # Classic Readme Variables ############
-
 CLASSIC_MODS_VER := Official_Retroarch_v1_7_5b_CMO
 CLASSIC_MODS_NAME := RetroArch v1.7.5b (Official CM Optimised)
 MOD_CREATOR := Libretro + ClassicMods
@@ -21,6 +20,10 @@ CXX_V = arm-linux-gnueabihf-g++-8
 AS_V = arm-linux-gnueabihf-as
 CC_AS_V = arm-linux-gnueabihf-gcc-8
 
+# Libretro Defines ####################
+HAVE_CLASSIC = 1 
+
+
 all: $(TARGET)
 
 retroarch:
@@ -52,6 +55,13 @@ retroarch:
 	cd /tmp/$(HAKCHI_DIR)/; tar -czvf "$(CLASSIC_MODS_VER).hmod" *
 	mv /tmp/$(HAKCHI_DIR)/$(CLASSIC_MODS_VER).hmod .
 	@echo "** BUILT CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
+
+	#COMMODORE 64 MINI BUILD (WIP)
+
+	@echo "*********************************************************************"
+	@echo "*** Classic ARM7 Cortex A7 build and packages built successfully! ***"
+	@echo "****************** Winner, Winner, Chicken Dinner! ******************"
+	@echo "*********************************************************************"
 clean:
 	rm -rf obj-unix
 	rm -f *.d
diff --git a/Makefile.common b/Makefile.common
index 361de1abb5..67d0c6845e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -7,8 +7,9 @@ ifeq ($(HAVE_STACK_USAGE), 1)
 CFLAGS += -fstack-usage
 endif
 
-ifeq ($(HAVE_HAKCHI), 1)
-CFLAGS += -DHAVE_HAKCHI
+ifeq ($(HAVE_CLASSIC), 1)
+  LDFLAGS += -static-libgcc -static-libstdc++
+  CFLAGS += -DHAVE_CLASSIC
 endif
 
 ifeq ($(HAVE_GL_CONTEXT),)