Skip to content

Commit 06106e0

Browse files
committed
scripts: waifulib: psvita: make sce_sys truly optional in apply_vpk
1 parent 9759b80 commit 06106e0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

scripts/waifulib/psvita.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ def configure(conf):
3030
conf.find_program('vita-mksfoex', var='MKSFOEX')
3131
conf.find_program('vita-pack-vpk', var='PACKVPK')
3232

33+
conf.env.SCESYS_ST = '-a %s=sce_sys'
34+
3335
class mkvelf(Task.Task):
3436
color = 'CYAN'
3537
run_str = '${ELF_CREATE} -g ${YMLFILE} ${ELFFILE} ${TGT}'
@@ -45,7 +47,7 @@ class mksfoex(Task.Task):
4547

4648
class mkvpk(Task.Task):
4749
color = 'CYAN'
48-
run_str = '${PACKVPK} -s ${SFOFILE} -b ${FSELFFILE} -a ${SCESYS}=sce_sys ${TGT}'
50+
run_str = '${PACKVPK} -s ${SFOFILE} -b ${FSELFFILE} ${SCESYS_ST:SCESYS} ${TGT}'
4951

5052
@TaskGen.feature('cxxprogram', 'cprogram')
5153
@TaskGen.after_method('apply_link')
@@ -107,7 +109,8 @@ def apply_vpk(self):
107109
vpkfile = sfofile.change_ext('.vpk')
108110
out_nodes = [vpkfile]
109111

110-
if scesysdir: self.env.SCESYS = str(scesysdir)
112+
if scesysdir:
113+
self.env.SCESYS = [str(scesysdir)]
111114
self.env.VPKFILE = str(vpkfile)
112115

113116
self.vpk_task = self.create_task('mkvpk', in_nodes)

0 commit comments

Comments
 (0)