Properly use fw_folder relative build

diff --git a/Makefile b/Makefile
index 1d09b587dbd4cc300e7f18056d04d5952c0b4ac0..16337508969a3cabb1a9c718e508ae9de15b6d70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,52 +42,52 @@ all: hosttools font a9lh patch external
 
 .PHONY: hosttools
 hosttools:
-       make -C host/bdfe
+       make -C host/bdfe dir_out=$(dir_out) fw_folder=$(fw_folder)
 
 .PHONY: font
 font: hosttools
        ./host/conv-font-bin.sh
-       mkdir -p out/corbenik/bits
-       cp host/termfont.bin out/corbenik/bits/
+       mkdir -p $(dir_out)/$(fw_folder)/bits
+       cp host/termfont.bin $(dir_out)/$(fw_folder)/bits/
 
 .PHONY: full
-full: all contrib out/corbenik/locale
-       cp README.md LICENSE.txt out/
+full: all contrib $(dir_out)/$(fw_folder)/locale
+       cp README.md LICENSE.txt $(dir_out)/
        cd out && zip -r9 release.zip *
        cd out && sha512sum -b release.zip > release.zip.sha512 # Security.
 
 .PHONY: contrib
 contrib:
-       make -C contrib
+       make -C contrib dir_out=$(dir_out) fw_folder=$(fw_folder)
 
 .PHONY: external
 external:
-       make -C external
+       make -C external dir_out=$(dir_out) fw_folder=$(fw_folder)
 
 .PHONY: patch
 patch:
-       make -C patch
+       make -C patch dir_out=$(dir_out) fw_folder=$(fw_folder)
 
 .PHONY: a9lh
 a9lh: $(dir_out)/arm9loaderhax.bin
        # For the reboot patch.
-       mkdir -p $(dir_out)/corbenik/bits
-       cp $(dir_out)/arm9loaderhax.bin $(dir_out)/corbenik/bits/corbenik.bin
+       mkdir -p $(dir_out)/$(fw_folder)/bits
+       cp $(dir_out)/arm9loaderhax.bin $(dir_out)/$(fw_folder)/bits/corbenik.bin
 
 .PHONY: reformat
 reformat:
        clang-format -i $(dir_source)/*.{c,h} $(dir_source)/*/*.{c,h} external/loader/source/*.{c,h}
 
-out/corbenik/locale: all
+$(dir_out)/$(fw_folder)/locale: all
        echo "Generating langemu data from 3dsdb - may take a bit"
        cd out/corbenik && ../../host/generate_langemu_conf.sh
 
 .PHONY: clean
 clean:
        rm -f host/{font-emit,font.h,font_prop.h,termfont.bin}
-       make -C external clean
-       make -C patch clean
-       make -C host/bdfe clean
+       make -C external dir_out=$(dir_out) fw_folder=$(fw_folder) clean
+       make -C patch dir_out=$(dir_out) fw_folder=$(fw_folder) clean
+       make -C host/bdfe dir_out=$(dir_out) fw_folder=$(fw_folder) clean
        rm -rf $(dir_out) $(dir_build)
 
 .PHONY: $(dir_out)/arm9loaderhax.bin

diff --git a/external/Makefile b/external/Makefile
index 21f13501e243d979266a472fe4c869599d033b16..dbbf79a5bfdd33c04f5701155e93148e1908dbe5 100644 (file)
--- a/external/Makefile
+++ b/external/Makefile
@@ -1,14 +1,16 @@
+out := ../$(dir_out)/$(fw_folder)
+
 .PHONY: all
 all: loader bits screeninit
-       mkdir -p ../out/corbenik/module
-       mkdir -p ../out/corbenik/bits
-       cp loader/loader.cxi ../out/corbenik/module/loader.cxi
-       cp bits/backdoor.bin ../out/corbenik/bits/backdoor.bin
-       cp bits/emunand.bin ../out/corbenik/bits/emunand.bin
-       cp bits/chain.bin ../out/corbenik/bits/chain.bin
-       cp bits/reboot_hook.bin ../out/corbenik/bits/reboot_hook.bin
-       cp bits/reboot_code.bin ../out/corbenik/bits/reboot_code.bin
-       cp screeninit/build/screeninit.bin ../out/corbenik/bits/screeninit.bin
+       mkdir -p $(out)/module
+       mkdir -p $(out)/bits
+       cp loader/loader.cxi $(out)/module/loader.cxi
+       cp bits/backdoor.bin $(out)/bits/backdoor.bin
+       cp bits/emunand.bin $(out)/bits/emunand.bin
+       cp bits/chain.bin $(out)/bits/chain.bin
+       cp bits/reboot_hook.bin $(out)/bits/reboot_hook.bin
+       cp bits/reboot_code.bin $(out)/bits/reboot_code.bin
+       cp screeninit/build/screeninit.bin $(out)/bits/screeninit.bin
 
 .PHONY: clean
 clean: clean_loader clean_bits clean_screeninit