Merge branch 'master' into mobile_hacks

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()
 	)
+

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',
 	])
@@ -131,16 +130,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',
@@ -148,6 +139,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']:
@@ -167,3 +167,4 @@ def build(bld):
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		idx      = bld.get_taskgen_count()
 	)
+

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', 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.SIMPLE_MOD_HACKS:
 		conf.define('MOBILE_HACKS', '1')