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 +50 -49
12 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3fec1d286a - Show all commits

26
examples/PoolBox/Makefile
View File

@ -10,27 +10,27 @@ endif
# Add regions on your own
# Extend them with what you need
ifeq ($(REGION),SCEE)
export TV_FORMAT=PAL
export LICENSE=LICENSEE
export BOOT_FILE=SLES_000.25
export PSX_TV_FORMAT=PAL
export PSX_LICENSE=LICENSEE
export PSX_BOOT_FILE=SLES_000.25
endif
ifeq ($(REGION),SCEA)
export TV_FORMAT=NTSC
export LICENSE=LICENSEA
export BOOT_FILE=SLUS_001.51
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEA
export PSX_BOOT_FILE=SLUS_001.51
endif
ifeq ($(REGION),SCEI)
export TV_FORMAT=NTSC
export LICENSE=LICENSEJ
export BOOT_FILE=XXXX_AAA.AA
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEJ
export PSX_BOOT_FILE=XXXX_AAA.AA
endif
ifndef TV_FORMAT
$(error TV_FORMAT has not be set! REGION not specified?)
ifndef PSX_TV_FORMAT
$(error PSX_TV_FORMAT has not be set! REGION not specified?)
endif
ifndef LICENSE
$(error LICENSE has not be set! REGION not specified?)
ifndef PSX_LICENSE
$(error PSX_LICENSE has not be set! REGION not specified?)
endif
all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)

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

@ -1,17 +1,16 @@
<ISO_Project>
<Description>
<Publisher>Jaby</Publisher>
<License>%PSX_LICENSE_PATH%/%LICENSE%.DAT</License>
<License>%PSX_LICENSE_PATH%/%PSX_LICENSE%.DAT</License>
</Description>
<Track>
<File name = "SYSTEM.CNF">System.cnf.subst</File>
<!--For pkg use: SLES_000.25;1 or SLUS_001.51;1 - no japanse version yet. Otherwise leave as "XXXX_AAA.AA"-->
<Main name = "%BOOT_FILE%" lba_source = "../application/src/asset_mgr.cpp">../application/bin/%TV_FORMAT%/PSX-release/PoolBox.psexe</Main>
<Overlay name = "CTO.BIN" lba_source = "../application/src/Overlay/ControllerTest/controller_test_assets.cpp">../application/bin/%TV_FORMAT%/PSX-release/Overlay.controller_tests</Overlay>
<Overlay name = "GTO.BIN" lba_source = "../application/src/Overlay/GPUTest/gpu_test_assets.cpp">../application/bin/%TV_FORMAT%/PSX-release/Overlay.gpu_tests</Overlay>
<Overlay name = "GTE.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.gte_tests</Overlay>
<Overlay name = "FCO.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.font_cycler</Overlay>
<Overlay name = "SCO.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.screen_center</Overlay>
<Main name = "%PSX_BOOT_FILE%" lba_source = "../application/src/asset_mgr.cpp">../application/bin/%PSX_TV_FORMAT%/PSX-release/PoolBox.psexe</Main>
<Overlay name = "CTO.BIN" lba_source = "../application/src/Overlay/ControllerTest/controller_test_assets.cpp">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.controller_tests</Overlay>
<Overlay name = "GTO.BIN" lba_source = "../application/src/Overlay/GPUTest/gpu_test_assets.cpp">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.gpu_tests</Overlay>
<Overlay name = "GTE.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.gte_tests</Overlay>
<Overlay name = "FCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.font_cycler</Overlay>
<Overlay name = "SCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.screen_center</Overlay>
<Directory name="ASSETS" hidden = "true">
<Directory name = "MAIN">

2
examples/PoolBox/iso/System.cnf.subst
View File

@ -1,4 +1,4 @@
BOOT=cdrom:\%BOOT_FILE%;1
BOOT=cdrom:\%PSX_BOOT_FILE%;1
TCB=4
EVENT=10
STACK=801FFFF0

6
mkfile/Makefile
View File

@ -8,9 +8,9 @@ desubstitute = $(subst !JABYENGINEMODULES,$(JABY_ENGINE_DIR)/include/modules,$(s
PLATFORM ?= PSX
#Build profile, possible values: release, debug, profile, coverage
BUILD_DIR ?= bin/$(TV_FORMAT)
BUILD_DIR ?= bin/$(PSX_TV_FORMAT)
BUILD_PROFILE ?= debug
TV_FORMAT ?= PAL
PSX_TV_FORMAT ?= PAL
CONFIG_NAME ?= $(PLATFORM)-$(BUILD_PROFILE)
OUTPUT_DIR = $(BUILD_DIR)/$(CONFIG_NAME)
@ -55,7 +55,7 @@ CCFLAGS += -std=c++20 -fmodules-ts
CCFLAGS += $(CCFLAGS_$(BUILD_PROFILE))
CCFLAGS += $(ARCHFLAGS)
CCFLAGS += $(INCLUDES)
CCFLAGS += -DJABYENGINE_$(TV_FORMAT)
CCFLAGS += -DJABYENGINE_$(PSX_TV_FORMAT)
#Linker flags
LDFLAGS_release += -Os

2
mkfile/PSEXETarget.mk
View File

@ -8,7 +8,7 @@ JABY_ENGINE_LIB_DIR = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)/$(CUST
JABY_ENGINE_SUPPORT_LIB_DIR = $(JABY_ENGINE_DIR)/Support/lib/PSX-$(BUILD_PROFILE)
JABY_ENGINE_SUPPORT_LIBS = $(addprefix -l,$(SUPPORT_LIBS))
JABY_ENGINE_SUPPORT_DEPS = $(addsuffix .a,$(addprefix $(JABY_ENGINE_SUPPORT_LIB_DIR)/lib,$(SUPPORT_LIBS)))
JABY_ENGINE_LIB_NAME = JabyEngine_$(TV_FORMAT)
JABY_ENGINE_LIB_NAME = JabyEngine_$(PSX_TV_FORMAT)
OVERLAY_TARGET = $(foreach ovl, $(OVERLAYSECTION), $(OUTPUT_DIR)/Overlay$(ovl))

4
src/Library/Library.code-workspace
View File

@ -20,10 +20,10 @@
"label": "make",
"type": "shell",
"windows": {
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
},
"linux": {
"command": "make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
"command": "make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
},
"group": "build"
},

4
src/Library/MakeAll.mk
View File

@ -1,6 +1,6 @@
define make_one
$(MAKE) $1 TV_FORMAT=PAL CUSTOM_CONFIG=$2
$(MAKE) $1 TV_FORMAT=NTSC CUSTOM_CONFIG=$2
$(MAKE) $1 PSX_TV_FORMAT=PAL CUSTOM_CONFIG=$2
$(MAKE) $1 PSX_TV_FORMAT=NTSC CUSTOM_CONFIG=$2
endef
define make_all

2
src/Library/Makefile
View File

@ -1,7 +1,7 @@
include ../../mkfile/common/RebuildTarget.mk
JABY_ENGINE_DIR = ../../
ARTIFACT = libJabyEngine_$(TV_FORMAT)
ARTIFACT = libJabyEngine_$(PSX_TV_FORMAT)
SPLASH_IMAGE = src/BootLoader/splash_image_pal_boot.hpp
SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp

23
template/JabyEngine-PSX_Game/Makefile
View File

@ -10,24 +10,27 @@ endif
# Add regions on your own
# Extend them with what you need
ifeq ($(REGION),SCEE)
export TV_FORMAT=PAL
export LICENSE=LICENSEE
export PSX_TV_FORMAT=PAL
export PSX_LICENSE=LICENSEE
export PSX_BOOT_FILE=XXXX_AAA.AA
endif
ifeq ($(REGION),SCEA)
export TV_FORMAT=NTSC
export LICENSE=LICENSEA
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEA
export PSX_BOOT_FILE=XXXX_AAA.AA
endif
ifeq ($(REGION),SCEI)
export TV_FORMAT=NTSC
export LICENSE=LICENSEJ
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEJ
export PSX_BOOT_FILE=XXXX_AAA.AA
endif
ifndef TV_FORMAT
$(error TV_FORMAT has not be set! REGION not specified?)
ifndef PSX_TV_FORMAT
$(error PSX_TV_FORMAT has not be set! REGION not specified?)
endif
ifndef LICENSE
$(error LICENSE has not be set! REGION not specified?)
ifndef PSX_LICENSE
$(error PSX_LICENSE has not be set! REGION not specified?)
endif
all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)

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

@ -1,11 +1,10 @@
<ISO_Project>
<Description>
<!--<Publisher>Jaby</Publisher>-->
<!--<License>%PSX_LICENSE_PATH%/%LICENSE%.DAT</License>-->
<!--<License>%PSX_LICENSE_PATH%/%PSX_LICENSE%.DAT</License>-->
</Description>
<Track>
<File name="SYSTEM.CNF">System.cnf</File>
<!--For pkg use: SLES_000.25;1 or SLUS_001.51;1 - no japanse version yet. Otherwise leave as "XXXX_AAA.AA"-->
<Main name="XXXX_AAA.AA">../application/bin/%TV_FORMAT%/PSX-release/#{ProjectName}.psexe</Main>
<File name = "SYSTEM.CNF">System.cnf.subst</File>
<Main name = "%PSX_BOOT_FILE%">../application/bin/%PSX_TV_FORMAT%/PSX-release/#{ProjectName}.psexe</Main>
</Track>
</ISO_Project>

4
template/JabyEngine-PSX_Game/iso/System.cnf
View File

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

4
template/JabyEngine-PSX_Game/iso/System.cnf.subst Normal file
View File

@ -0,0 +1,4 @@
BOOT=cdrom:\%PSX_BOOT_FILE%;1
TCB=4
EVENT=10
STACK=801FFFF0