mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-03-12 13:31:33 +00:00
Merge branch 'master' into tot
This commit is contained in:
commit
b8ef59b737
@ -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()
|
||||
)
|
||||
|
||||
|
19
dlls/wscript
19
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',
|
||||
])
|
||||
@ -130,16 +129,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',
|
||||
@ -147,6 +138,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']:
|
||||
@ -166,3 +166,4 @@ def build(bld):
|
||||
subsystem = bld.env.MSVC_SUBSYSTEM,
|
||||
idx = bld.get_taskgen_count()
|
||||
)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user