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

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +74 -24
8 changed files with 74 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8b45cb2ad9 - Show all commits

27
examples/PoolBox/Makefile
View File

@ -3,6 +3,33 @@ make_assets = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C assets
make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C iso
ifndef REGION
$(error REGION has to be set!)
endif
# Add regions on your own
# Extend them with what you need
ifeq ($(REGION),SCEE)
export TV_FORMAT=PAL
export LICENSE=LICENSEE
endif
ifeq ($(REGION),SCEA)
export TV_FORMAT=NTSC
export LICENSE=LICENSEA
endif
ifeq ($(REGION),SCEI)
export TV_FORMAT=NTSC
export LICENSE=LICENSEJ
endif
ifndef TV_FORMAT
$(error TV_FORMAT has not be set! REGION not specified?)
endif
ifndef LICENSE
$(error LICENSE has not be set! REGION not specified?)
endif
all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)
all_%: always

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

@ -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} TV_FORMAT=${input:tv format} 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} REGION=${input:region} 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}",
"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region}",
},
"group": {
"kind": "build",
@ -62,11 +62,11 @@
"description": "the build target"
},
{
"id": "tv format",
"id": "region",
"type": "pickString",
"options": ["PAL", "NTSC"],
"default": "PAL",
"description": "TV format to use"
"options": ["SCEE", "SCEA", "SCEI"],
"default": "SCEE",
"description": "Region profile to use"
},
{
"id": "output memory map",

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

@ -2,7 +2,7 @@
<Description>
<Publisher>Jaby</Publisher>
<!--TODO: How to switch this between PAL and NTSC?-->
<License>%PSX_LICENSE_PATH%/LICENSEE.DAT</License>
<License>%PSX_LICENSE_PATH%/%LICENSE%.DAT</License>
</Description>
<Track>
<File name = "SYSTEM.CNF">System.cnf</File>

10
mkfile/ISOMakefile.mk
View File

@ -1,12 +1,8 @@
ifndef TV_FORMAT
$(error TV_FORMAT is not set!)
endif
CD_OUTPUT ?= $(TV_FORMAT)/$(ARTIFACT).bin
CD_OUTPUT ?= $(REGION)/$(ARTIFACT).bin
$(CD_OUTPUT): always
@mkdir -p $(TV_FORMAT)
psxcdgen_ex --list $(TV_FORMAT)/$(ARTIFACT).lba -o $(TV_FORMAT)/$(ARTIFACT) psx bin-cue Config.xml
@mkdir -p $(REGION)
psxcdgen_ex --list $(REGION)/$(ARTIFACT).lba -o $(REGION)/$(ARTIFACT) psx bin-cue Config.xml
all: $(CD_OUTPUT)

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

@ -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} TV_FORMAT=${input:tv format} 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} REGION=${input:region} 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}",
"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region}",
},
"group": {
"kind": "build",
@ -62,11 +62,11 @@
"description": "the build target"
},
{
"id": "tv format",
"id": "region",
"type": "pickString",
"options": ["PAL", "NTSC"],
"default": "PAL",
"description": "TV format to use"
"options": ["SCEE", "SCEA", "SCEI"],
"default": "SCEE",
"description": "Region profile to use"
},
{
"id": "output memory map",

27
template/JabyEngine-PSX_Game/Makefile
View File

@ -3,6 +3,33 @@ make_assets = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C assets
make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C iso
ifndef REGION
$(error REGION has to be set!)
endif
# Add regions on your own
# Extend them with what you need
ifeq ($(REGION),SCEE)
export TV_FORMAT=PAL
export LICENSE=LICENSEE
endif
ifeq ($(REGION),SCEA)
export TV_FORMAT=NTSC
export LICENSE=LICENSEA
endif
ifeq ($(REGION),SCEI)
export TV_FORMAT=NTSC
export LICENSE=LICENSEJ
endif
ifndef TV_FORMAT
$(error TV_FORMAT has not be set! REGION not specified?)
endif
ifndef LICENSE
$(error LICENSE has not be set! REGION not specified?)
endif
all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)
all_%: always

2
template/JabyEngine-PSX_Game/application/Makefile
View File

@ -1,6 +1,6 @@
#OVERLAY_CONFIG = Overlays.json
include $(JABY_ENGINE_DIR)/lib/Wildcard.mk
include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk
SRCS = $(call rwildcard, src, c cpp)
INCLUDES += -I$(JABY_ENGINE_DIR)/include

2
template/JabyEngine-PSX_Game/iso/Config.xml
View File

@ -1,7 +1,7 @@
<ISO_Project>
<Description>
<!--<Publisher>Jaby</Publisher>-->
<!--<License>%PSX_LICENSE_PATH%/LICENSEE.DAT</License>-->
<!--<License>%PSX_LICENSE_PATH%/%LICENSE%.DAT</License>-->
</Description>
<Track>
<File name="SYSTEM.CNF">System.cnf</File>