From 68f633e9cdb8dd3e9c596c88d5ed42f919f252f0 Mon Sep 17 00:00:00 2001 From: SNMetamorph <25657591+SNMetamorph@users.noreply.github.com> Date: Tue, 16 Aug 2022 19:08:44 +0400 Subject: [PATCH] wscript: fixed opus include path --- engine/wscript | 6 ++---- wscript | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/engine/wscript b/engine/wscript index baeb6fb6..7f3bdfce 100644 --- a/engine/wscript +++ b/engine/wscript @@ -107,7 +107,7 @@ def configure(conf): def build(bld): is_cxx_link = False - libs = [ 'public', 'dllemu' ] + libs = [ 'public', 'dllemu', 'opus' ] # basic build: dedicated only source = bld.path.ant_glob([ @@ -166,9 +166,7 @@ def build(bld): 'client/vgui/*.c', 'client/avi/*.c']) - libs.append('opus') - - includes = ['common', 'server', 'client', 'client/vgui', 'tests', '.', '../public', '../common', '../filesystem', '../pm_shared', '../3rdparty/opus/opus/include' ] + includes = ['common', 'server', 'client', 'client/vgui', 'tests', '.', '../public', '../common', '../filesystem', '../pm_shared' ] if bld.env.SINGLE_BINARY: install_path = bld.env.BINDIR diff --git a/wscript b/wscript index fb7a4d3a..de5c5da3 100644 --- a/wscript +++ b/wscript @@ -54,7 +54,7 @@ class Subproject: return True SUBDIRS = [ - Subproject('3rdparty/opus', mandatory=True), + Subproject('3rdparty/opus', dedicated=False, mandatory=True), Subproject('public', dedicated=False, mandatory = True), Subproject('filesystem', dedicated=False, mandatory = True), Subproject('game_launch', singlebin=True),