From a7d4cafe10166a33645a1f14247a43b3858c97b0 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 25 Aug 2022 19:33:16 +0300 Subject: [PATCH] wscript: finally disable building opus for dedicated --- engine/wscript | 5 +++-- wscript | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/wscript b/engine/wscript index 7f3bdfce..3df51568 100644 --- a/engine/wscript +++ b/engine/wscript @@ -107,7 +107,7 @@ def configure(conf): def build(bld): is_cxx_link = False - libs = [ 'public', 'dllemu', 'opus' ] + libs = [ 'public', 'dllemu' ] # basic build: dedicated only source = bld.path.ant_glob([ @@ -165,7 +165,8 @@ def build(bld): 'client/*.c', 'client/vgui/*.c', 'client/avi/*.c']) - + libs += ['opus'] + includes = ['common', 'server', 'client', 'client/vgui', 'tests', '.', '../public', '../common', '../filesystem', '../pm_shared' ] if bld.env.SINGLE_BINARY: diff --git a/wscript b/wscript index 04a9d90e..fb335fb6 100644 --- a/wscript +++ b/wscript @@ -47,7 +47,7 @@ SUBDIRS = [ Subproject('game_launch', lambda x: not x.env.SINGLE_BINARY and x.env.DEST_OS != 'android'), # disable only by external dependency presense - Subproject('3rdparty/opus', lambda x: not x.env.HAVE_SYSTEM_OPUS), + Subproject('3rdparty/opus', lambda x: not x.env.HAVE_SYSTEM_OPUS and not x.env.DEDICATED), # enabled optionally Subproject('utils/mdldec', lambda x: x.env.ENABLE_UTILS),