mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-01-26 06:34:23 +00:00
Merge branch 'poke646' into poke646_vendetta
This commit is contained in:
commit
6ec736842d
@ -75,13 +75,13 @@ def build(bld):
|
||||
'.',
|
||||
'hl/',
|
||||
'../dlls',
|
||||
'../dlls/wpn_shared',
|
||||
'../common',
|
||||
'../engine',
|
||||
'../pm_shared',
|
||||
'../game_shared',
|
||||
'../public',
|
||||
'../utils/false_vgui/include'
|
||||
'../utils/false_vgui/include',
|
||||
'../dlls/poke646'
|
||||
]
|
||||
|
||||
defines = ['CLIENT_DLL']
|
||||
@ -112,3 +112,4 @@ def build(bld):
|
||||
subsystem = bld.env.MSVC_SUBSYSTEM,
|
||||
idx = bld.get_taskgen_count()
|
||||
)
|
||||
|
||||
|
22
dlls/wscript
22
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',
|
||||
])
|
||||
@ -133,23 +132,25 @@ 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',
|
||||
'../game_shared',
|
||||
'../public'
|
||||
'../public',
|
||||
'poke646'
|
||||
]
|
||||
|
||||
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']:
|
||||
@ -169,3 +170,4 @@ def build(bld):
|
||||
subsystem = bld.env.MSVC_SUBSYSTEM,
|
||||
idx = bld.get_taskgen_count()
|
||||
)
|
||||
|
||||
|
6
wscript
6
wscript
@ -270,7 +270,11 @@ def configure(conf):
|
||||
if conf.env.cxxshlib_PATTERN.startswith('lib'):
|
||||
conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
|
||||
|
||||
conf.define('CLIENT_WEAPONS', '1')
|
||||
conf.define('CLIENT_WEAPONS', '0')
|
||||
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')
|
||||
|
Loading…
x
Reference in New Issue
Block a user