FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2025-01-03 06:35:36 +01:00
Code Issues 2 Projects Releases Wiki Activity

waf: upgrade to latest, fix for api changes

Browse Source
This commit is contained in:
Alibek Omarov 2024-10-24 00:37:05 +03:00
parent f7eb8cd913
commit 0e79326571
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/mainui vendored

@ -1 +1 @@
Subproject commit abf5ad2c34e0d04b29f5914701cb498aeac935ed
Subproject commit 197f125f8d6ffce518584631fad4666debd33b7a

11
waf vendored
View File

File diff suppressed because one or more lines are too long

16
wscript
View File

@ -67,7 +67,6 @@ SUBDIRS = [
# always configured and built
Subproject('public'),
Subproject('filesystem'),
Subproject('engine'),
Subproject('stub/server'),
Subproject('dllemu'),
@ -86,6 +85,7 @@ SUBDIRS = [
# Subproject('3rdparty/freevgui', lambda x: not x.env.DEDICATED),
Subproject('stub/client', lambda x: not x.env.DEDICATED),
Subproject('game_launch', lambda x: not x.env.DISABLE_LAUNCHER),
Subproject('engine'), # keep latest for static linking
# disable only by external dependency presense
Subproject('3rdparty/opus', lambda x: not x.env.HAVE_SYSTEM_OPUS and not x.env.DEDICATED),
@ -97,7 +97,6 @@ SUBDIRS = [
# enabled on PSVita only
Subproject('ref/gl/vgl_shim', lambda x: x.env.DEST_OS == 'psvita'),
]
REFDLLS = [
@ -198,7 +197,7 @@ def configure(conf):
if conf.env.COMPILER_CC == 'msvc':
conf.load('msvc_pdb')
conf.load('msvs msdev subproject clang_compilation_database strip_on_install waf_unit_test enforce_pic cmake')
conf.load('msvs msdev subproject clang_compilation_database strip_on_install waf_unit_test enforce_pic cmake force_32bit')
# Force XP compatibility, all build targets should add subsystem=bld.env.MSVC_SUBSYSTEM
if conf.env.MSVC_TARGETS[0] == 'amd64_x86' or conf.env.MSVC_TARGETS[0] == 'x86':
@ -250,14 +249,13 @@ def configure(conf):
# There is now `-4` (or `--32bits`) configure flag for those
# who want to specifically build engine for 32-bit
if conf.env.DEST_OS in ['win32', 'linux'] and conf.env.DEST_CPU == 'x86_64':
conf.env.BIT32_MANDATORY = not conf.options.ALLOW64
force_32bit = not conf.options.ALLOW64
else:
conf.env.BIT32_MANDATORY = conf.options.FORCE32
force_32bit = conf.options.FORCE32
if conf.env.BIT32_MANDATORY:
if force_32bit:
Logs.info('WARNING: will build engine for 32-bit target')
conf.load('force_32bit')
conf.force_32bit(True)
cflags, linkflags = conf.get_optimization_flags()
cxxflags = list(cflags) # optimization flags are common between C and C++ but we need a copy
@ -380,7 +378,7 @@ def configure(conf):
conf.env.SUPPORT_BSP2_FORMAT = conf.options.SUPPORT_BSP2_FORMAT
# disable game_launch compiling on platform where it's not needed
conf.env.DISABLE_LAUNCHER = conf.env.DEST_OS in ['android', 'nswitch', 'psvita', 'dos'] or conf.env.MAGX or conf.env.DEDICATED
conf.env.DISABLE_LAUNCHER = conf.env.DEST_OS in ['android', 'nswitch', 'psvita', 'dos'] or conf.env.MAGX or conf.env.DEDICATED or conf.env.STATIC_LINKING
if conf.env.SAILFISH == 'aurora':
conf.env.DEFAULT_RPATH = '/usr/share/su.xash.Engine/lib'