From 8c1ae2283ded85673cdbb79fe6c664064af3cae7 Mon Sep 17 00:00:00 2001
From: chaoskagami <chaos.kagami@gmail.com>
Date: Fri, 1 Jul 2016 10:43:49 -0400
Subject: [PATCH] Fix CFW folder logic

---
 Makefile                 | 10 +++++-----
 external/loader/Makefile |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 8ac97ad..f25c3a3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ AS ?= as
 LD ?= ld
 OC ?= objcopy
 
-name ?= Corbenik
+fw_name ?= Corbenik
 
 # If unset, the primary folder is /corbenik.
 fw_folder ?= corbenik
@@ -30,7 +30,7 @@ REL ?= master
 CHAINLOADER ?= 1
 
 CROSS_ASFLAGS := -mlittle-endian -mcpu=arm946e-s -march=armv5te
-CROSS_CFLAGS  := -MMD -MP -Wall -Wextra -Werror -fomit-frame-pointer -Os $(ASFLAGS) -fshort-wchar -fno-builtin -std=gnu11 -DVERSION=\"$(REVISION)\" -DREL=\"$(REL)\" -DCHAINLOADER=$(CHAINLOADER)
+CROSS_CFLAGS  := -MMD -MP -Wall -Wextra -Werror -fomit-frame-pointer -Os $(ASFLAGS) -fshort-wchar -fno-builtin -std=gnu11 -DVERSION=\"$(REVISION)\" -DREL=\"$(REL)\" -DCHAINLOADER=$(CHAINLOADER) -DPATH_CFW=\"/$(fw_folder)\"
 CROSS_FLAGS   := dir_out=$(abspath $(dir_out)) --no-print-directory
 CROSS_LDFLAGS := -nostdlib -Wl,-z,defs -lgcc -Wl,-Map,$(dir_build)/link.map
 
@@ -71,15 +71,15 @@ full: all contrib $(dir_out)/$(fw_folder)/locale
 
 .PHONY: contrib
 contrib:
-	make -C contrib dir_out=$(dir_out) fw_folder=$(fw_folder)
+	make -C contrib dir_out=$(dir_out) fw_name=$(fw_name) fw_folder=$(fw_folder)
 
 .PHONY: external
 external:
-	make -C external dir_out=$(dir_out) fw_folder=$(fw_folder) CHAINLOADER=$(CHAINLOADER)
+	make -C external dir_out=$(dir_out) fw_name=$(fw_name) fw_folder=$(fw_folder) CHAINLOADER=$(CHAINLOADER)
 
 .PHONY: patch
 patch:
-	make -C patch dir_out=$(dir_out) fw_folder=$(fw_folder)
+	make -C patch dir_out=$(dir_out) fw_name=$(fw_name) fw_folder=$(fw_folder)
 
 .PHONY: a9lh
 a9lh: $(dir_out)/arm9loaderhax.bin
diff --git a/external/loader/Makefile b/external/loader/Makefile
index cb5e5b8..b40f7fe 100644
--- a/external/loader/Makefile
+++ b/external/loader/Makefile
@@ -36,7 +36,7 @@ CFLAGS	:= -flto -Wall -Os -mword-relocations $(ERROR) \
 			-fomit-frame-pointer -ffunction-sections -fdata-sections -fshort-wchar \
 			$(ARCH)
 
-CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -DLOADER=1
+CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -DLOADER=1 -DPATH_CFW=\"/$(fw_folder)\"
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu99
 
-- 
2.39.5