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

Integrate pop-fe better

This commit is contained in:
Jaby 2024-03-22 00:50:37 -05:00
parent a7557f26dc
commit 6e9a376a86
9 changed files with 30 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/run_pop_fe.bat
View File

@ -1,11 +0,0 @@
rem %1 input cue file
rem %2 Optional picture files
setlocal ENABLEDELAYEDEXPANSION
echo %PATH%
if [%2] == [] (
set img_input=
) else (
set img_input=--cover %2/cover.png --pic0 %2/pic0.png --pic1 %2/pic1.png
)
pop-fe.exe --ps1-newemu --ps3-pkg=%~dpn1.pkg %img_input% %1

6
bin/run_pop_fe.sh
View File

@ -1,5 +1,9 @@
#!/bin/bash
#Made possible by Cody the white tiger
BASEDIR=$(dirname "$0")
cd $BASEDIR
source extern/py3venv/bin/activate
cd extern/pop-fe/
./pop-fe.py --title=MyGame --ps1-newemu --cover=$2/Icon.png --pic0=$2/Pic0.png --pic1=$2/Pic1.png --ps3-pkg="${1%.*}.pkg" $1
./pop-fe.py --title=$1 --ps1-newemu --cover=$2/Icon.png --pic0=$2/Pic0.png --pic1=$2/Pic1.png --ps3-pkg="${3%.*}.pkg" $3

7
examples/PoolBox/Makefile
View File

@ -13,17 +13,16 @@ ifeq ($(REGION),SCEE)
export PSX_TV_FORMAT=PAL
export PSX_LICENSE=LICENSEE
export PSX_BOOT_FILE=SLES_AAA.AA
#SLES_000.25
endif
ifeq ($(REGION),SCEA)
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEA
export PSX_BOOT_FILE=SLUS_001.51
export PSX_BOOT_FILE=SLUS_AAA.AA
endif
ifeq ($(REGION),SCEI)
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEJ
export PSX_BOOT_FILE=XXXX_AAA.AA
export PSX_BOOT_FILE=SLJS_AAA.AA
endif
ifndef PSX_TV_FORMAT
@ -47,5 +46,7 @@ application_%: always
$(call make_application,$*)
cd_%: always
$(call make_cd,$*)
pkg_%: always
$(call make_cd,pkg_$*)
always: ;

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

@ -27,19 +27,6 @@
}
}
},
{
"label": "create pkg (experimental)",
"type": "shell",
"command": "wsl ./run_pop_fe.sh $(wslpath ${workspaceFolder}/iso/${input:region}/PoolBox.cue) $(wslpath ${workspaceFolder}/iso)",
"group": "build",
"options": {
// v otherwise the tool won't start...
"cwd": "${env:JABY_ENGINE_PATH}/bin",
"env": {
"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
}
}
},
{
"label": "read memory map",
"type": "shell",
@ -63,7 +50,7 @@
{
"id": "project",
"type": "pickString",
"options": ["all", "assets", "application", "cd"],
"options": ["all", "assets", "application", "cd", "pkg"],
"default": "all",
"description": "Project to build"
},

14
mkfile/ISOMakefile.mk
View File

@ -1,15 +1,23 @@
CD_OUTPUT ?= $(REGION)/$(ARTIFACT).bin
CD_OUTPUT ?= $(REGION)/$(ARTIFACT).bin
PKG_OUTPUT ?= $(REGION)/$(ARTIFACT).pkg
$(CD_OUTPUT): always
@mkdir -p $(REGION)
psxcdgen_ex --list $(REGION)/$(ARTIFACT).lba -o $(REGION)/$(ARTIFACT) psx bin-cue Config.xml
all: $(CD_OUTPUT)
$(PKG_OUTPUT): always
@mkdir -p $(REGION)
@echo "!!PKG generation is experimentel!!"
run_pop_fe.sh $(ARTIFACT) $(PWD)/iso $(PWD)/iso/$(REGION)/$(ARTIFACT).cue
clean:
all: $(CD_OUTPUT)
clean: pkg_clean
rm -fr $(REGION)/*.bin
rm -fr $(REGION)/*.cue
rm -fr $(REGION)/*.lba
pkg_all: $(PKG_OUTPUT)
pkg_clean:
rm -fr $(REGION)/*.pkg
always: ;

1
readme.md
View File

@ -14,5 +14,6 @@
- [ ] Support more GTE
- [X] Easy serial code swap
- [X] Support .subst files to be substituted with environment variables
- [X] Support pop-fe
- [ ] PS3 PKG generation tool?
- [ ] PS3 runtime detection?

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

@ -27,19 +27,6 @@
}
}
},
{
"label": "create pkg (experimental)",
"type": "shell",
"command": "run_pop_fe.bat ${workspaceFolder}/iso/${input:region}/#{ProjectName}.cue",
"group": "build",
"options": {
// v otherwise the tool won't start...
"cwd": "${env:POP_FE_PATH}",
"env": {
"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
}
}
},
{
"label": "read memory map",
"type": "shell",
@ -63,7 +50,7 @@
{
"id": "project",
"type": "pickString",
"options": ["all", "assets", "application", "cd"],
"options": ["all", "assets", "application", "cd", "pkg"],
"default": "all",
"description": "Project to build"
},

8
template/JabyEngine-PSX_Game/Makefile
View File

@ -12,17 +12,17 @@ endif
ifeq ($(REGION),SCEE)
export PSX_TV_FORMAT=PAL
export PSX_LICENSE=LICENSEE
export PSX_BOOT_FILE=XXXX_AAA.AA
export PSX_BOOT_FILE=SLES_AAA.AA
endif
ifeq ($(REGION),SCEA)
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEA
export PSX_BOOT_FILE=XXXX_AAA.AA
export PSX_BOOT_FILE=SLUS_AAA.AA
endif
ifeq ($(REGION),SCEI)
export PSX_TV_FORMAT=NTSC
export PSX_LICENSE=LICENSEJ
export PSX_BOOT_FILE=XXXX_AAA.AA
export PSX_BOOT_FILE=SLJS_AAA.AA
endif
ifndef PSX_TV_FORMAT
@ -46,5 +46,7 @@ application_%: always
$(call make_application,$*)
cd_%: always
$(call make_cd,$*)
pkg_%: always
$(call make_cd,pkg_$*)
always: ;

2
wsl_scripts/install_pop-fe.sh
View File

@ -1,4 +1,6 @@
#!/bin/bash
#Made possible by Cody the white tiger
BASEDIR=$(dirname "$0")
mkdir -p $BASEDIR/../bin/extern/
cd $BASEDIR/../bin/extern