From a7b3fd6036a4a629cc25fbcf21fb655aac90a2bc Mon Sep 17 00:00:00 2001
From: kr3nshaw <20672068+kr3nshaw@users.noreply.github.com>
Date: Mon, 8 Jun 2020 20:36:34 +1000
Subject: Amended knarc makefile so as not to conflict with devkitARM

---
 tools/knarc/Makefile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile
index 336fad3f..f8f263d2 100644
--- a/tools/knarc/Makefile
+++ b/tools/knarc/Makefile
@@ -1,17 +1,10 @@
-CXX ?= g++-9
-
-CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs
-
-SRCS := Source.cpp Narc.cpp
-HEADERS := Narc.h
-
 .PHONY: all clean
 
 all: knarc
 	@:
 
-knarc: $(SRCS) $(HEADERS)
-	$(CXX) $(SRCS) -o $@ $(LDFLAGS) $(CXXFLAGS)
+knarc: Source.cpp Narc.cpp Narc.h
+	g++-9 Source.cpp Narc.cpp -o $@ -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs
 
 clean:
 	$(RM) knarc knarc.exe
-- 
cgit v1.2.3


From 9243be03ab56a74fd083205c9a2017e4fc4b4ff6 Mon Sep 17 00:00:00 2001
From: kr3nshaw <20672068+kr3nshaw@users.noreply.github.com>
Date: Mon, 8 Jun 2020 20:41:34 +1000
Subject: Changed g++-9 to g++ in knarc makefile

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

(limited to 'tools')

diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile
index f8f263d2..3fc47182 100644
--- a/tools/knarc/Makefile
+++ b/tools/knarc/Makefile
@@ -4,7 +4,7 @@ all: knarc
 	@:
 
 knarc: Source.cpp Narc.cpp Narc.h
-	g++-9 Source.cpp Narc.cpp -o $@ -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs
+	g++ Source.cpp Narc.cpp -o $@ -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs
 
 clean:
 	$(RM) knarc knarc.exe
-- 
cgit v1.2.3


From 1dd31333cf0734259f720fdcb5bbef5145d07292 Mon Sep 17 00:00:00 2001
From: kr3nshaw <20672068+kr3nshaw@users.noreply.github.com>
Date: Mon, 8 Jun 2020 22:42:54 +1000
Subject: Changed first line of knarc makefile

---
 tools/knarc/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile
index 3fc47182..2e851af6 100644
--- a/tools/knarc/Makefile
+++ b/tools/knarc/Makefile
@@ -1,10 +1,17 @@
+CXX := g++
+
+CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs
+
+SRCS := Source.cpp Narc.cpp
+HEADERS := Narc.h
+
 .PHONY: all clean
 
 all: knarc
 	@:
 
-knarc: Source.cpp Narc.cpp Narc.h
-	g++ Source.cpp Narc.cpp -o $@ -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs
+knarc: $(SRCS) $(HEADERS)
+	$(CXX) $(SRCS) -o $@ $(LDFLAGS) $(CXXFLAGS)
 
 clean:
 	$(RM) knarc knarc.exe
-- 
cgit v1.2.3