Use psxcdgen_ex under WSL and improve wslpath and makefiles

template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace

@@ -11,37 +11,17 @@
 			{
 				"label": "build",
 				"type": "shell",
-				"command": "wsl make ${input:target} BUILD_PROFILE=${input:build profile} JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
+				"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})",
 				"group": {
 					"kind": "build",
 					"isDefault": true
 				},
 				"options": {
-					"cwd": "application",
 					"env": {
 						"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
 					}
 				}
 			},
-			{
-				"label": "cdgen",
-				"type": "shell",
-				"command": "${env:JABY_ENGINE_PATH}/bin/psxcdgen_ex.exe --list iso/#{ProjectName}.lba -o iso/#{ProjectName} psx bin-cue iso/Config.xml",
-				"group": {
-					"kind": "build",
-					"isDefault": true
-				}
-			},
-			{
-				"label": "build & generate cd",
-				"type": "shell",
-				"dependsOn": ["build", "cdgen"],
-				"dependsOrder": "sequence",
-				"group": {
-					"kind": "build",
-					"isDefault": true
-				}
-			}
 		],
 		"inputs": [
 			{
@@ -51,6 +31,13 @@
 				"default": "release",
 				"description": "The build profile for #{ProjectName}"
 			},
+			{
+				"id": "project",
+				"type": "pickString",
+				"options": ["all", "assets", "application", "cd"],
+				"default": "all",
+				"description": "Project to build"
+			},
 			{
 				"id": "target",
 				"type": "pickString",

template/JabyEngine-PSX_Game/Makefile

@@ -0,0 +1,23 @@
+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
+
+all clean rebuild: always
+	$(call make_assets,$(MAKECMDGOALS))
+	$(call make_application,$(MAKECMDGOALS))
+	$(call make_cd,$(MAKECMDGOALS))
+
+all_%: always
+	$(call make_assets,$*)
+	$(call make_application,$*)
+	$(call make_cd,$*)
+
+assets_%: always
+	$(call make_assets,$*)
+application_%: always
+	$(call make_application,$*)
+cd_%: always
+	$(call make_cd,$*)
+
+always: ;

template/JabyEngine-PSX_Game/application/Makefile

@@ -1,4 +1,3 @@
-ARTIFACT  = #{ProjectName}
 BUILD_DIR = bin
 
 #OVERLAY_CONFIG = Overlays.json
@@ -9,9 +8,4 @@ SRCS  = $(call rwildcard, src, c cpp)
 INCLUDES += -I$(JABY_ENGINE_DIR)/include
 
 include $(JABY_ENGINE_DIR)/lib/Makefile
-include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk
-
-clean:
-	rm -fr $(OUTPUT_DIR)
-	rm -fr ../iso/*.bin
-	rm -fr ../iso/*.cue
+include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk

template/JabyEngine-PSX_Game/assets/Makefile

@@ -0,0 +1,14 @@
+include $(JABY_ENGINE_DIR)/lib/ExportPath.mk
+include $(JABY_ENGINE_DIR)/lib/RebuildTarget.mk
+
+OUTPUT_DIR = bin
+
+# Create build targets like
+# $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
+# @mkdir -p $(OUTPUT_DIR)
+# jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4
+
+all: #$(OUTPUT_DIR)/TexturePage.bin
+
+clean:
+	rm -fr $(OUTPUT_DIR)

template/JabyEngine-PSX_Game/iso/Config.xml

@@ -4,7 +4,7 @@
         <!--<License>%PSX_LICENSE_PATH%/LICENSEE.DAT</License>-->
     </Description>
     <Track>
-        <File    name="SYSTEM.CNF">iso/System.cnf</File>
-        <Main    name="XXXX_AAA.AA">application/bin/PSX-release/#{ProjectName}.psexe</Main>
+        <File    name="SYSTEM.CNF">System.cnf</File>
+        <Main    name="XXXX_AAA.AA">../application/bin/PSX-release/#{ProjectName}.psexe</Main>
     </Track>
 </ISO_Project>