Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
8 changed files with 56 additions and 28 deletions
Showing only changes of commit 464dd8f7d5 - Show all commits

View File

@ -11,19 +11,22 @@
{
"label": "build",
"type": "shell",
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build profile} JABY_ENGINE_DIR=../${config:jaby_engine_path}",
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build profile} JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
"group": {
"kind": "build",
"isDefault": true
},
"options": {
"cwd": "application"
"cwd": "application",
"env": {
"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
}
}
},
{
"label": "cdgen",
"type": "shell",
"command": "${config:jaby_engine_path}/bin/psxcdgen.exe iso/Config.xml",
"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
@ -46,7 +49,7 @@
"type": "pickString",
"options": ["debug", "release"],
"default": "release",
"description": "the build profile for #{ProjectName}"
"description": "The build profile for #{ProjectName}"
},
{
"id": "target",
@ -58,6 +61,17 @@
]
},
"settings": {
"jaby_engine_path": "#{JabyEnginePath}",
"C_Cpp.default.includePath": [
"${env:JABY_ENGINE_PATH}/include"
],
"C_Cpp.default.compilerPath": "",
"C_Cpp.default.cStandard": "c17",
"C_Cpp.default.cppStandard": "c++20",
"C_Cpp.default.intelliSenseMode": "linux-gcc-x86",
"C_Cpp.default.compilerArgs": [
],
"C_Cpp.default.defines": [
"JABYENGINE_PAL"
],
}
}

View File

@ -2,4 +2,5 @@
*.cue
*.d
*.o
*.lba
**/bin

View File

@ -1,10 +1,12 @@
ARTIFACT = #{ProjectName}
BUILD_DIR = bin
#OVERLAY_CONFIG = Overlays.json
include $(JABY_ENGINE_DIR)/lib/Wildcard.mk
SRCS = $(call rwildcard, src, c cpp)
LIBS = -L$(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE) -lJabyEngine
INCLUDES += -I$(JABY_ENGINE_DIR)/include
include $(JABY_ENGINE_DIR)/lib/Makefile
include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk

View File

@ -0,0 +1,12 @@
{
"slot_0": {
"main_area": {
"pattern": "bin/*/src/MainState/*.o"
}
},
"slot_1": {
"main_area2": {
"pattern": "bin/*/src/MainState2/*.o"
}
}
}

View File

@ -1,3 +1,5 @@
int main() {
return 0;
#include <stdio.h>
void main() {
printf("Hello Planschbecken!\n");
}

View File

@ -1,19 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<iso_project image_name="iso/#{ProjectName}.bin" cue_sheet="iso/#{ProjectName}.cue" no_xa="0">
<track type="data">
<identifiers
system = "PLAYSTATION"
application = "PLAYSTATION"
volume = "MYDISC"
volume_set = "MYDISC"
publisher = "JABY"
data_preparer = "MKPSXISO"
copyright = "COPYLEFT"
/>
<license file="D:/RetroGameDev/PSX/PSYQ/psyq/cdgen/LCNSFILE/LICENSEE.DAT"/>
<directory_tree>
<file name="SYSTEM.CNF" type="data" source="iso/System.cnf"/>
<file name="SCES_003.90" type="data" source="application/bin/PSX-release/#{ProjectName}.psexe"/>
</directory_tree>
</track>
</iso_project>
<ISO_Project>
<Description>
<!--<Publisher>Jaby</Publisher>-->
<!--<License>%LICENSE_ENV_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>
</Track>
</ISO_Project>

View File

@ -1,4 +1,4 @@
BOOT=cdrom:\SCES_003.90;1
BOOT=cdrom:\XXXX_AAA.AA;1
TCB=4
EVENT=10
STACK=801FFFF0

6
template/install.bat Normal file
View File

@ -0,0 +1,6 @@
echo off
set dst_name=JabyEngine-PSX_Game
set dst="%APPDATA%\Code\User\ProjectTemplates\%dst_name%"
mkdir %dst%
xcopy /s %dst_name% %dst%