jaby/jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Use psxcdgen_ex under WSL and improve wslpath and makefiles

Browse Source
This commit is contained in:
jaby
2023-08-25 05:15:23 +02:00
parent 5c944dcb0a
commit d919f4fbd5
14 changed files with 113 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
examples/PoolBox/Makefile
View File

@@ -1,5 +1,23 @@
ARTIFACT = PoolBox
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
$(MAKE) $(MAKECMDGOALS) -C assets
$(MAKE) $(MAKECMDGOALS) -C application
$(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: ;

28
examples/PoolBox/PoolBox.code-workspace
View File

@@ -11,7 +11,7 @@
{
"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
@@ -22,25 +22,6 @@
}
}
},
{
"label": "cdgen",
"type": "shell",
"command": "${env:JABY_ENGINE_PATH}/bin/psxcdgen_ex.exe --list iso/PoolBox.lba -o iso/PoolBox 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": [
{
@@ -50,6 +31,13 @@
"default": "release",
"description": "The build profile for PoolBox"
},
{
"id": "project",
"type": "pickString",
"options": ["all", "assets", "application", "cd"],
"default": "all",
"description": "Project to build"
},
{
"id": "target",
"type": "pickString",

8
examples/PoolBox/application/Makefile
View File

@@ -1,4 +1,3 @@
ARTIFACT = PoolBox
BUILD_DIR = bin
OVERLAY_CONFIG = Overlays.json
@@ -10,9 +9,4 @@ INCLUDES += -I$(JABY_ENGINE_DIR)/include
CCFLAGS += -save-temps=obj
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

10
examples/PoolBox/iso/Config.xml
View File

@@ -4,14 +4,14 @@
<License>%PSX_LICENSE_PATH%/LICENSEE.DAT</License>
</Description>
<Track>
<File name = "SYSTEM.CNF">iso/System.cnf</File>
<Main name = "XXXX_AAA.AA" lba_source = "application/src/main_assets.cpp">application/bin/PSX-release/PoolBox.psexe</Main>
<File name = "SYSTEM.CNF">System.cnf</File>
<Main name = "XXXX_AAA.AA" lba_source = "../application/src/main_assets.cpp">../application/bin/PSX-release/PoolBox.psexe</Main>
<Directory name="ASSETS" hidden = "true">
<Directory name = "MAIN">
<File name = "FONT.BIN" lz4 = "already">assets/bin/YoshiFont.bin</File>
<File name = "FONT.BIN" lz4 = "already">../assets/bin/YoshiFont.bin</File>
</Directory>
<File name = "FONT.BIN" lz4 = "already">assets/bin/TexturePage.bin</File>
<File name = "ICON.BIN" lz4 = "already">assets/bin/IconTexture.bin</File>
<File name = "FONT.BIN" lz4 = "already">../assets/bin/TexturePage.bin</File>
<File name = "ICON.BIN" lz4 = "already">../assets/bin/IconTexture.bin</File>
</Directory>
</Track>
</ISO_Project>