Browse Source

scripts: psvita: move TITLEID and APPNAME to engine elf build arguments

pull/2/head
fgsfds 2 years ago committed by Alibek Omarov
parent
commit
957154f097
  1. 2
      engine/wscript
  2. 4
      scripts/waifulib/psvita.py
  3. 3
      wscript

2
engine/wscript

@ -239,6 +239,8 @@ def build(bld):
nacp = 'platform/nswitch/xash3d-fwgs.nacp', nacp = 'platform/nswitch/xash3d-fwgs.nacp',
icon = 'platform/nswitch/icon.jpg', icon = 'platform/nswitch/icon.jpg',
sce_sys = 'platform/psvita/sce_sys', sce_sys = 'platform/psvita/sce_sys',
title_id = 'XASH10000',
app_name = 'xash3d-fwgs'
) )
else: else:
if bld.env.SINGLE_BINARY: if bld.env.SINGLE_BINARY:

4
scripts/waifulib/psvita.py

@ -83,10 +83,14 @@ def apply_fself(self):
def apply_sfo(self): def apply_sfo(self):
fselffile = self.fself_task.outputs[0] fselffile = self.fself_task.outputs[0]
in_nodes = [fselffile] in_nodes = [fselffile]
scetitleid = getattr(self, 'title_id', None)
sceappname = getattr(self, 'app_name', None)
sfofile = fselffile.change_ext('.sfo') sfofile = fselffile.change_ext('.sfo')
out_nodes = [sfofile] out_nodes = [sfofile]
if scetitleid: self.env.TITLEID = scetitleid
if sceappname: self.env.APPNAME = sceappname
self.env.SFOFILE = str(sfofile) self.env.SFOFILE = str(sfofile)
self.sfo_task = self.create_task('mksfoex', in_nodes) self.sfo_task = self.create_task('mksfoex', in_nodes)

3
wscript

@ -273,9 +273,6 @@ def configure(conf):
conf.env.append_unique('CXXFLAGS_cxxshlib', ['-fPIC', '-fno-use-cxa-atexit']) conf.env.append_unique('CXXFLAGS_cxxshlib', ['-fPIC', '-fno-use-cxa-atexit'])
conf.env.append_unique('LINKFLAGS_cshlib', ['-nostdlib', '-Wl,--unresolved-symbols=ignore-all']) conf.env.append_unique('LINKFLAGS_cshlib', ['-nostdlib', '-Wl,--unresolved-symbols=ignore-all'])
conf.env.append_unique('LINKFLAGS_cxxshlib', ['-nostdlib', '-Wl,--unresolved-symbols=ignore-all']) conf.env.append_unique('LINKFLAGS_cxxshlib', ['-nostdlib', '-Wl,--unresolved-symbols=ignore-all'])
# set the metadata
conf.env.TITLEID = 'XASH10000'
conf.env.APPNAME = 'xash3d-fwgs'
# And here C++ flags starts to be treated separately # And here C++ flags starts to be treated separately
cxxflags = list(cflags) cxxflags = list(cflags)

Loading…
Cancel
Save