From 1dc04bd0bda03d623a630ea1dc929a5eb33f9b46 Mon Sep 17 00:00:00 2001
From: jaby <jaby@william.zone>
Date: Sun, 4 Feb 2024 20:35:15 -0500
Subject: [PATCH] Enable PAL and NTSC build

---
 examples/PoolBox/PoolBox.code-workspace       | 15 +++++++++++----
 examples/PoolBox/application/Makefile         |  2 --
 examples/PoolBox/iso/Config.xml               | 12 ++++++------
 mkfile/ISOMakefile.mk                         | 15 ++++++++++-----
 mkfile/Makefile                               |  2 +-
 src/Library/Library.code-workspace            | 11 +++++++++--
 src/Library/Makefile                          |  1 -
 .../#{ProjectName}.code-workspace             | 19 ++++++++++++++++---
 template/JabyEngine-PSX_Game/Makefile         |  2 +-
 .../JabyEngine-PSX_Game/application/Makefile  |  7 +++----
 template/JabyEngine-PSX_Game/assets/Makefile  |  4 ++--
 template/JabyEngine-PSX_Game/iso/Config.xml   |  2 +-
 template/JabyEngine-PSX_Game/iso/Makefile     |  2 ++
 13 files changed, 62 insertions(+), 32 deletions(-)
 create mode 100644 template/JabyEngine-PSX_Game/iso/Makefile

diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace
index 849b20e6..fba4bb64 100644
--- a/examples/PoolBox/PoolBox.code-workspace
+++ b/examples/PoolBox/PoolBox.code-workspace
@@ -11,11 +11,11 @@
 			{
 				"label": "build",
 				"type": "shell",
-				"windows": { //                                                                                v re-export for WSL                                 v re-export for WSL
-					"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
+				"windows": { //                                                                                                             v re-export for WSL                                 v re-export for WSL
+					"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} TV_FORMAT=${input:tv format} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
 				},
 				"linux":   {
-					"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile}",
+					"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} TV_FORMAT=${input:tv format}",
 				},
 				"group": {
 					"kind": "build",
@@ -30,7 +30,7 @@
 			{
 				"label": "read memory map",
 				"type": "shell",
-				"command": "psxreadmap.exe ${input:output memory map} application/bin/PSX-${input:build profile}/PoolBox.elf",
+				"command": "psxreadmap.exe ${input:output memory map} application/bin/${input:tv format}/PSX-${input:build profile}/PoolBox.elf",
 				"problemMatcher": [],
 				"options": {
 					"env": {
@@ -61,6 +61,13 @@
 				"default": "all",
 				"description": "the build target"
 			},
+			{
+                "id": "tv format",
+                "type": "pickString",
+                "options": ["PAL", "NTSC"],
+                "default": "PAL",
+                "description": "TV format to use"
+            },
 			{
 				"id": "output memory map",
 				"type": "pickString",
diff --git a/examples/PoolBox/application/Makefile b/examples/PoolBox/application/Makefile
index 269b0507..2b94dbf6 100644
--- a/examples/PoolBox/application/Makefile
+++ b/examples/PoolBox/application/Makefile
@@ -1,5 +1,3 @@
-BUILD_DIR = bin
-
 OVERLAY_CONFIG = Overlays.json
 
 include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk
diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml
index a2f4907e..f34eb2b7 100644
--- a/examples/PoolBox/iso/Config.xml
+++ b/examples/PoolBox/iso/Config.xml
@@ -5,12 +5,12 @@
     </Description>
     <Track>
         <File    name = "SYSTEM.CNF">System.cnf</File>
-        <Main    name = "XXXX_AAA.AA" lba_source = "../application/src/asset_mgr.cpp">../application/bin/PSX-release/PoolBox.psexe</Main>
-        <Overlay name = "CTO.BIN" lba_source = "../application/src/Overlay/ControllerTest/controller_test_assets.cpp">../application/bin/PSX-release/Overlay.controller_tests</Overlay>
-        <Overlay name = "GTO.BIN" lba_source = "../application/src/Overlay/GPUTest/gpu_test_assets.cpp">../application/bin/PSX-release/Overlay.gpu_tests</Overlay>
-        <Overlay name = "GTE.BIN">../application/bin/PSX-release/Overlay.gte_tests</Overlay>
-        <Overlay name = "FCO.BIN">../application/bin/PSX-release/Overlay.font_cycler</Overlay>
-        <Overlay name = "SCO.BIN">../application/bin/PSX-release/Overlay.screen_center</Overlay>
+        <Main    name = "XXXX_AAA.AA" lba_source = "../application/src/asset_mgr.cpp">../application/bin/%TV_FORMAT%/PSX-release/PoolBox.psexe</Main>
+        <Overlay name = "CTO.BIN" lba_source = "../application/src/Overlay/ControllerTest/controller_test_assets.cpp">../application/bin/%TV_FORMAT%/PSX-release/Overlay.controller_tests</Overlay>
+        <Overlay name = "GTO.BIN" lba_source = "../application/src/Overlay/GPUTest/gpu_test_assets.cpp">../application/bin/%TV_FORMAT%/PSX-release/Overlay.gpu_tests</Overlay>
+        <Overlay name = "GTE.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.gte_tests</Overlay>
+        <Overlay name = "FCO.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.font_cycler</Overlay>
+        <Overlay name = "SCO.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.screen_center</Overlay>
 
         <Directory name="ASSETS" hidden = "true">
             <Directory name = "MAIN">
diff --git a/mkfile/ISOMakefile.mk b/mkfile/ISOMakefile.mk
index 487f60e0..95ec4b8a 100644
--- a/mkfile/ISOMakefile.mk
+++ b/mkfile/ISOMakefile.mk
@@ -1,13 +1,18 @@
-CD_OUTPUT ?= $(ARTIFACT).bin
+ifndef TV_FORMAT
+$(error TV_FORMAT is not set!)
+endif
+
+CD_OUTPUT ?= $(TV_FORMAT)/$(ARTIFACT).bin
 
 $(CD_OUTPUT): always
-	psxcdgen_ex --list $(ARTIFACT).lba -o $(ARTIFACT) psx bin-cue Config.xml
+	@mkdir -p $(TV_FORMAT)
+	psxcdgen_ex --list $(TV_FORMAT)/$(ARTIFACT).lba -o $(TV_FORMAT)/$(ARTIFACT) psx bin-cue Config.xml
 
 all: $(CD_OUTPUT)
 
 clean:
-	rm -fr *.bin
-	rm -fr *.cue
-	rm -fr *.lba
+	rm -fr $(TV_FORMAT)/*.bin
+	rm -fr $(TV_FORMAT)/*.cue
+	rm -fr $(TV_FORMAT)/*.lba
 
 always: ;
\ No newline at end of file
diff --git a/mkfile/Makefile b/mkfile/Makefile
index a058f5d5..1c54609f 100644
--- a/mkfile/Makefile
+++ b/mkfile/Makefile
@@ -8,7 +8,7 @@ desubstitute = $(subst !JABYENGINEMODULES,$(JABY_ENGINE_DIR)/include/modules,$(s
 PLATFORM ?= PSX
 
 #Build profile, possible values: release, debug, profile, coverage
-BUILD_DIR     ?= bin
+BUILD_DIR     ?= bin/$(TV_FORMAT)
 BUILD_PROFILE ?= debug
 TV_FORMAT     ?= PAL
 
diff --git a/src/Library/Library.code-workspace b/src/Library/Library.code-workspace
index 8ca4cc99..31dbda46 100644
--- a/src/Library/Library.code-workspace
+++ b/src/Library/Library.code-workspace
@@ -20,10 +20,10 @@
                 "label": "make",
                 "type": "shell",
                 "windows": {
-                    "command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg}",
+                    "command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format}",
                 },
                 "linux":   {
-                    "command": "make ${input:target} BUILD_PROFILE=${input:build cfg}",
+                    "command": "make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format}",
                 },
                 "group": "build"
             }
@@ -36,6 +36,13 @@
                 "default": "release",
                 "description": "build configuration"
             },
+            {
+                "id": "tv format",
+                "type": "pickString",
+                "options": ["PAL", "NTSC"],
+                "default": "PAL",
+                "description": "TV format to use"
+            },
             {
                 "id": "target",
                 "type": "pickString",
diff --git a/src/Library/Makefile b/src/Library/Makefile
index 77035462..369913d3 100644
--- a/src/Library/Makefile
+++ b/src/Library/Makefile
@@ -2,7 +2,6 @@ include ../../mkfile/RebuildTarget.mk
 JABY_ENGINE_DIR = ../../
 
 ARTIFACT  = libJabyEngine_$(TV_FORMAT)
-BUILD_DIR = bin
 
 SPLASH_IMAGE      = src/BootLoader/splash_image_pal_boot.hpp
 SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp
diff --git a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
index fc06fe28..f647d657 100644
--- a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
+++ b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
@@ -11,7 +11,12 @@
 			{
 				"label": "build",
 				"type": "shell",
-				"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
+				"windows": { //                                                                                                             v re-export for WSL                                 v re-export for WSL
+					"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} TV_FORMAT=${input:tv format} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
+				},
+				"linux":   {
+					"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} TV_FORMAT=${input:tv format}",
+				},
 				"group": {
 					"kind": "build",
 					"isDefault": true
@@ -25,7 +30,7 @@
 			{
 				"label": "read memory map",
 				"type": "shell",
-				"command": "psxreadmap.exe ${input:output memory map} application/bin/PSX-${input:build profile}/#{ProjectName}.elf",
+				"command": "psxreadmap.exe ${input:output memory map} application/bin/${input:tv format}/PSX-${input:build profile}/#{ProjectName}.elf",
 				"problemMatcher": [],
 				"options": {
 					"env": {
@@ -56,6 +61,13 @@
 				"default": "all",
 				"description": "the build target"
 			},
+			{
+                "id": "tv format",
+                "type": "pickString",
+                "options": ["PAL", "NTSC"],
+                "default": "PAL",
+                "description": "TV format to use"
+            },
 			{
 				"id": "output memory map",
 				"type": "pickString",
@@ -67,7 +79,8 @@
 	},
 	"settings": {
 		"C_Cpp.default.includePath": [
-			"${env:JABY_ENGINE_PATH}/include"
+			"${env:JABY_ENGINE_PATH}/include",
+			"${env:JABY_ENGINE_PATH}/Support/include"
             ],
 		"C_Cpp.default.compilerPath": "",
 		"C_Cpp.default.cStandard": "c17",
diff --git a/template/JabyEngine-PSX_Game/Makefile b/template/JabyEngine-PSX_Game/Makefile
index 66b3d67a..7a55ca16 100644
--- a/template/JabyEngine-PSX_Game/Makefile
+++ b/template/JabyEngine-PSX_Game/Makefile
@@ -1,7 +1,7 @@
 ARTIFACT         = #{ProjectName}
 make_assets      = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C assets
 make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
-make_cd          = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -f $(JABY_ENGINE_DIR)/lib/ISOTarget.mk -C iso
+make_cd          = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C iso
 
 all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)  
 
diff --git a/template/JabyEngine-PSX_Game/application/Makefile b/template/JabyEngine-PSX_Game/application/Makefile
index 040b2822..34b513c7 100644
--- a/template/JabyEngine-PSX_Game/application/Makefile
+++ b/template/JabyEngine-PSX_Game/application/Makefile
@@ -1,14 +1,13 @@
-BUILD_DIR = bin
-
 #OVERLAY_CONFIG = Overlays.json
 
 include $(JABY_ENGINE_DIR)/lib/Wildcard.mk
 SRCS  = $(call rwildcard, src, c cpp)
 
 INCLUDES += -I$(JABY_ENGINE_DIR)/include
+#INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include
 
 #Example for using Support libs
 #SUPPORT_LIBS += FontWriter
 
-include $(JABY_ENGINE_DIR)/lib/Makefile
-include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk
\ No newline at end of file
+include $(JABY_ENGINE_DIR)/mkfile/Makefile
+include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/assets/Makefile b/template/JabyEngine-PSX_Game/assets/Makefile
index 56da6521..36885406 100644
--- a/template/JabyEngine-PSX_Game/assets/Makefile
+++ b/template/JabyEngine-PSX_Game/assets/Makefile
@@ -1,5 +1,5 @@
-include $(JABY_ENGINE_DIR)/lib/ExportPath.mk
-include $(JABY_ENGINE_DIR)/lib/RebuildTarget.mk
+include $(JABY_ENGINE_DIR)/mkfile/ExportPath.mk
+include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk
 
 OUTPUT_DIR = bin
 
diff --git a/template/JabyEngine-PSX_Game/iso/Config.xml b/template/JabyEngine-PSX_Game/iso/Config.xml
index 3210deef..55288cf6 100644
--- a/template/JabyEngine-PSX_Game/iso/Config.xml
+++ b/template/JabyEngine-PSX_Game/iso/Config.xml
@@ -5,6 +5,6 @@
     </Description>
     <Track>
         <File    name="SYSTEM.CNF">System.cnf</File>
-        <Main    name="XXXX_AAA.AA">../application/bin/PSX-release/#{ProjectName}.psexe</Main>
+        <Main    name="XXXX_AAA.AA">../application/bin/%TV_FORMAT%/PSX-release/#{ProjectName}.psexe</Main>
     </Track>
 </ISO_Project>
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/iso/Makefile b/template/JabyEngine-PSX_Game/iso/Makefile
new file mode 100644
index 00000000..6887609e
--- /dev/null
+++ b/template/JabyEngine-PSX_Game/iso/Makefile
@@ -0,0 +1,2 @@
+include $(JABY_ENGINE_DIR)/mkfile/ISOMakefile.mk
+include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk
\ No newline at end of file