YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-03-13 06:21:08 +00:00
Code Issues Projects Releases Wiki Activity

engine: wscript: another try, link nswitch port using gcc and not g++

Browse Source
This commit is contained in:
Alibek Omarov 2023-12-02 19:29:30 +03:00
parent be8ade23e8
commit f0a2362da3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/wscript
View File

@ -189,8 +189,7 @@ def build(bld):
# HACK: link in the entirety of libstdc++ so that dynamic libs could use all of it without manual exporting # HACK: link in the entirety of libstdc++ so that dynamic libs could use all of it without manual exporting
# we can't do this right away because std::filesystem will complain about not having pathconf(), # we can't do this right away because std::filesystem will complain about not having pathconf(),
# which we have defined in sys_nswitch.c # which we have defined in sys_nswitch.c
# HACKHACK: disable implicit linking with libstdc++ to make the hack above work when linking as C++ program bld.env.LDFLAGS += ['-Wl,--whole-archive', '-lstdc++', '-Wl,--no-whole-archive', '-lm']
bld.env.LDFLAGS += ['-nostdlib++', '-Wl,--whole-archive', '-lstdc++', '-Wl,--no-whole-archive', '-lm']
if bld.env.DEST_OS == 'psvita': if bld.env.DEST_OS == 'psvita':
libs += [ 'VRTLD' ] libs += [ 'VRTLD' ]
@ -226,9 +225,13 @@ def build(bld):
# Switch and PSVita have custom parameters # Switch and PSVita have custom parameters
if bld.env.DEST_OS in ['nswitch', 'psvita']: if bld.env.DEST_OS in ['nswitch', 'psvita']:
program = 'cxxprogram'
if bld.env.DEST_OS == 'nswitch':
program = 'cprogram' # avoid linking with g++, we link standard library explicitly
bld(source = source, bld(source = source,
target = 'xash', target = 'xash',
features = 'c cxxprogram', features = ['c', program],
includes = includes, includes = includes,
use = libs, use = libs,
install_path = None, install_path = None,