From 87aa34d177634a3df226202b5c566417af5bc9f3 Mon Sep 17 00:00:00 2001
From: jaby <jaby@william.zone>
Date: Tue, 26 Apr 2022 20:46:47 +0200
Subject: [PATCH] Generate ISO image

---
 Code/iso/JabyEngineISODesc.xml  |  2 +-
 Code/iso/JabyEngineLBAFile.json |  8 --------
 JabyEngine.code-workspace       | 14 ++++++++++++++
 Makefile                        |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Code/iso/JabyEngineISODesc.xml b/Code/iso/JabyEngineISODesc.xml
index b82c9ca9..1c83164e 100644
--- a/Code/iso/JabyEngineISODesc.xml
+++ b/Code/iso/JabyEngineISODesc.xml
@@ -13,7 +13,7 @@
 		<license file="../../PSYQ/psyq/cdgen/LCNSFILE/LICENSEE.DAT"/>
 		<directory_tree>
 			<file name="SYSTEM.CNF"   type="data" source="Code/iso/JabyEngine.cnf"/>
-			<file name="SCES_003.90"  type="data" source="Code/bin/JabyEngine.ps-exe"/>
+			<file name="SCES_003.90"  type="data" source="Code/bin/PSX-release/JabyEngine.psexe"/>
 			
 			<dummy sectors="1024"/>	
 		</directory_tree>
diff --git a/Code/iso/JabyEngineLBAFile.json b/Code/iso/JabyEngineLBAFile.json
index d2119195..eb49df0b 100644
--- a/Code/iso/JabyEngineLBAFile.json
+++ b/Code/iso/JabyEngineLBAFile.json
@@ -2,13 +2,5 @@
     "Output":"Code/bin/GlobalLBATable.bin",
     "Input":"Code/iso/Info/JabyEngine.lba",
     "Order": [
-      "BOOT/SPLASH.TIM", 
-      "MAIN/OVERLAY.OVL", 
-      "TILESET/START.BIN",
-      "TILESET/DEBUG.BIN",
-      "MAIN/AREA/START.ARA", 
-      "SPRITE/TEST.BIN",
-      "SOUND/TEST.VAG",
-      "XA/NEGA.XA"
     ]
   }
\ No newline at end of file
diff --git a/JabyEngine.code-workspace b/JabyEngine.code-workspace
index 238b1ca9..f6fbf200 100644
--- a/JabyEngine.code-workspace
+++ b/JabyEngine.code-workspace
@@ -25,6 +25,10 @@
 						"PATH": "../../Tools/;../../Tools/mkpsxiso;${env:PATH}"
 					}
 				},
+				"group": {
+					"kind": "build",
+					"isDefault": true
+				},
 				"problemMatcher": [],
 			},
 			{
@@ -48,6 +52,16 @@
 					"kind": "build",
 					"isDefault": true
 				}
+			},
+			{
+				"label": "jaby make & finalize",
+				"type": "shell",
+				"dependsOrder": "sequence",
+				"dependsOn": ["jaby make", "finalize"],
+				"group": {
+					"kind": "build",
+					"isDefault": true
+				}
 			}
 		],
 		"inputs": [
diff --git a/Makefile b/Makefile
index 7055ae95..60ae2305 100644
--- a/Makefile
+++ b/Makefile
@@ -83,11 +83,11 @@ $(TARGET).elf: $(OBJS)
 	$(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) $(LIBS_all) $(LIBS)
 
 #Strips the psexe
-$(TARGET).ps-exe: $(TARGET).elf
+$(TARGET).psexe: $(TARGET).elf
 	$(PREFIX)-objcopy $(addprefix -R , $(OVERLAYSECTION)) -O binary $< $@
 
 #Rules section for default compilation and linking
-all: $(TARGET).ps-exe
+all: $(TARGET).psexe
 
 clean:
 	rm -fr $(OUTPUT_DIR)