From 8e4ded4017827a60a49885c98f43cda06bc61ab3 Mon Sep 17 00:00:00 2001
From: Andrey Akhmichin <sepulkarium45@yahoo.com>
Date: Sun, 9 Aug 2020 03:29:46 +0500
Subject: [PATCH 1/2] wscript: update yet again.

---
 cl_dll/wscript |  2 +-
 dlls/wscript   | 19 ++++++++++---------
 wscript        |  4 ++++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/cl_dll/wscript b/cl_dll/wscript
index b7bf76e9..f02742b7 100644
--- a/cl_dll/wscript
+++ b/cl_dll/wscript
@@ -88,7 +88,6 @@ def build(bld):
 		'.',
 		'hl/',
 		'../dlls',
-		'../dlls/wpn_shared',
 		'../common',
 		'../engine',
 		'../pm_shared',
@@ -125,3 +124,4 @@ def build(bld):
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
+
diff --git a/dlls/wscript b/dlls/wscript
index 5f17aefc..33d37185 100644
--- a/dlls/wscript
+++ b/dlls/wscript
@@ -21,7 +21,6 @@ def configure(conf):
 			conf.fatal("Could not find hl.def")
 
 def build(bld):
-	defines = []
 	source = bld.path.parent.ant_glob([
 		'pm_shared/*.c',
 	])
@@ -128,16 +127,8 @@ def build(bld):
 		'zombie.cpp'
 	]
 
-	if bld.env.VOICEMGR:
-		source += bld.path.parent.ant_glob([
-			'game_shared/voice_gamemgr.cpp',
-		])
-	else:
-		defines += ['NO_VOICEGAMEMGR']
-
 	includes = [
 		'.',
-		'wpn_shared',
 		'../common',
 		'../engine',
 		'../pm_shared',
@@ -145,6 +136,15 @@ def build(bld):
 		'../public'
 	]
 
+	defines = []
+
+	if bld.env.VOICEMGR:
+		source += bld.path.parent.ant_glob([
+		'game_shared/voice_gamemgr.cpp',
+		])
+	else:
+		defines += ['NO_VOICEGAMEMGR']
+
 	libs = []
 
 	if bld.env.DEST_OS not in ['android', 'dos']:
@@ -164,3 +164,4 @@ def build(bld):
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
+
diff --git a/wscript b/wscript
index b01647df..3e892ff1 100644
--- a/wscript
+++ b/wscript
@@ -271,6 +271,10 @@ def configure(conf):
 			conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
 
 	conf.define('CLIENT_WEAPONS', '1')
+	conf.define('CROWBAR_IDLE_ANIM', '0')
+	conf.define('CROWBAR_DELAY_FIX', '0')
+	conf.define('CROWBAR_FIX_RAPID_CROWBAR', '0')
+	conf.define('GAUSS_OVERCHARGE_FIX', '0')
 
 	if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS:
 		conf.define('MOBILE_HACKS', '1')

From d7509365f007490a64fe3c7329123d1364e4d083 Mon Sep 17 00:00:00 2001
From: Andrey Akhmichin <sepulkarium45@yahoo.com>
Date: Sun, 9 Aug 2020 22:23:16 +0500
Subject: [PATCH 2/2] wscript: Fix compilation.

---
 wscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wscript b/wscript
index 3e892ff1..b08bd906 100644
--- a/wscript
+++ b/wscript
@@ -271,10 +271,10 @@ def configure(conf):
 			conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
 
 	conf.define('CLIENT_WEAPONS', '1')
-	conf.define('CROWBAR_IDLE_ANIM', '0')
-	conf.define('CROWBAR_DELAY_FIX', '0')
-	conf.define('CROWBAR_FIX_RAPID_CROWBAR', '0')
-	conf.define('GAUSS_OVERCHARGE_FIX', '0')
+	conf.define('CROWBAR_IDLE_ANIM', False)
+	conf.define('CROWBAR_DELAY_FIX', False)
+	conf.define('CROWBAR_FIX_RAPID_CROWBAR', False)
+	conf.define('GAUSS_OVERCHARGE_FIX', False)
 
 	if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS:
 		conf.define('MOBILE_HACKS', '1')