vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wscript: link sound format related libraries in XASH_DEDICATED build mode

Browse source
This commit is contained in:
SNMetamorph 2024-12-01 20:04:10 +04:00 • committed by Alibek Omarov
parent b7c2c476a8
commit 73cf55b958
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/wscript
View file

@ -141,7 +141,7 @@ def build(bld):
bld(name = 'engine_includes', export_includes = '. common common/imagelib', use = 'filesystem_includes')
is_cxx_link = False
libs = [ 'engine_includes', 'public', 'dllemu', 'werror' ]
libs = [ 'engine_includes', 'public', 'dllemu', 'werror', 'opus', 'libvorbisfile', 'libopusfile' ]
# basic build: dedicated only
source = bld.path.ant_glob([
@ -236,7 +236,7 @@ def build(bld):
'client/vgui/*.c',
'client/avi/*.c'])
is_cxx_link = True
libs += ['opus', 'libvorbisfile', 'libopusfile', 'bzip2', 'MultiEmulator']
libs += ['bzip2', 'MultiEmulator']
rpath = bld.env.DEFAULT_RPATH

12
wscript
View file

@ -84,7 +84,11 @@ SUBDIRS = [
Subproject('filesystem'),
Subproject('stub/server'),
Subproject('dllemu'),
Subproject('3rdparty/libogg'),
Subproject('3rdparty/vorbis/libvorbis'),
Subproject('3rdparty/vorbis/libvorbisfile'),
Subproject('3rdparty/opusfile'),
# disable only by engine feature, makes no sense to even parse subprojects in dedicated mode
Subproject('3rdparty/extras', lambda x: not x.env.DEDICATED and x.env.DEST_OS != 'android'),
Subproject('3rdparty/nanogl', lambda x: not x.env.DEDICATED and x.env.NANOGL),
@ -96,10 +100,6 @@ SUBDIRS = [
Subproject('3rdparty/bzip2', lambda x: not x.env.DEDICATED and not x.env.HAVE_SYSTEM_BZ2),
Subproject('3rdparty/mainui', lambda x: not x.env.DEDICATED),
Subproject('3rdparty/vgui_support', lambda x: not x.env.DEDICATED),
Subproject('3rdparty/libogg', lambda x: not x.env.DEDICATED),
Subproject('3rdparty/vorbis/libvorbis', lambda x: not x.env.DEDICATED),
Subproject('3rdparty/vorbis/libvorbisfile', lambda x: not x.env.DEDICATED),
Subproject('3rdparty/opusfile', lambda x: not x.env.DEDICATED),
Subproject('3rdparty/MultiEmulator',lambda x: not x.env.DEDICATED),
# Subproject('3rdparty/freevgui', lambda x: not x.env.DEDICATED),
Subproject('stub/client', lambda x: not x.env.DEDICATED),
@ -107,7 +107,7 @@ SUBDIRS = [
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),
Subproject('3rdparty/opus', lambda x: not x.env.HAVE_SYSTEM_OPUS),
# enabled optionally
Subproject('utils/mdldec', lambda x: x.env.ENABLE_UTILS),