wscript: update yet again.

This commit is contained in:
Andrey Akhmichin 2020-08-09 03:29:46 +05:00
parent 2254a16b7b
commit 8e4ded4017
3 changed files with 15 additions and 10 deletions

View File

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

View File

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

View File

@ -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')