YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-02-05 03:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poke646' into poke646_vendetta

Browse Source
This commit is contained in:
Andrey Akhmichin 2020-08-09 03:41:10 +05:00
commit 6ec736842d
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cl_dll/wscript
View File

@ -75,13 +75,13 @@ def build(bld):
'.', '.',
'hl/', 'hl/',
'../dlls', '../dlls',
'../dlls/wpn_shared',
'../common', '../common',
'../engine', '../engine',
'../pm_shared', '../pm_shared',
'../game_shared', '../game_shared',
'../public', '../public',
'../utils/false_vgui/include' '../utils/false_vgui/include',
'../dlls/poke646'
] ]
defines = ['CLIENT_DLL'] defines = ['CLIENT_DLL']
@ -112,3 +112,4 @@ def build(bld):
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

24
dlls/wscript
View File

@ -21,7 +21,6 @@ def configure(conf):
conf.fatal("Could not find hl.def") conf.fatal("Could not find hl.def")
def build(bld): def build(bld):
defines = []
source = bld.path.parent.ant_glob([ source = bld.path.parent.ant_glob([
'pm_shared/*.c', 'pm_shared/*.c',
]) ])
@ -133,6 +132,18 @@ def build(bld):
'zombie.cpp' 'zombie.cpp'
] ]
includes = [
'.',
'../common',
'../engine',
'../pm_shared',
'../game_shared',
'../public',
'poke646'
]
defines = []
if bld.env.VOICEMGR: if bld.env.VOICEMGR:
source += bld.path.parent.ant_glob([ source += bld.path.parent.ant_glob([
'game_shared/voice_gamemgr.cpp', 'game_shared/voice_gamemgr.cpp',
@ -140,16 +151,6 @@ def build(bld):
else: else:
defines += ['NO_VOICEGAMEMGR'] defines += ['NO_VOICEGAMEMGR']
includes = [
'.',
'wpn_shared',
'../common',
'../engine',
'../pm_shared',
'../game_shared',
'../public'
]
libs = [] libs = []
if bld.env.DEST_OS not in ['android', 'dos']: if bld.env.DEST_OS not in ['android', 'dos']:
@ -169,3 +170,4 @@ def build(bld):
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

6
wscript
View File

@ -270,7 +270,11 @@ def configure(conf):
if conf.env.cxxshlib_PATTERN.startswith('lib'): if conf.env.cxxshlib_PATTERN.startswith('lib'):
conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:] 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: if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS:
conf.define('MOBILE_HACKS', '1') conf.define('MOBILE_HACKS', '1')