2
0
mirror of https://github.com/FWGS/hlsdk-xash3d synced 2024-11-25 03:09:24 +01:00

wscript: move libdl check into client, as it's the only subproject that uses it

This commit is contained in:
Alibek Omarov 2024-03-11 00:53:44 +03:00
parent 19f3e91978
commit 09a158f2e7
2 changed files with 6 additions and 4 deletions

View File

@ -27,6 +27,10 @@ def configure(conf):
conf.env.USE_NOVGUI_SCOREBOARD = conf.options.USE_NOVGUI_SCOREBOARD conf.env.USE_NOVGUI_SCOREBOARD = conf.options.USE_NOVGUI_SCOREBOARD
conf.env.USE_VOICEMGR = conf.options.USE_VOICEMGR conf.env.USE_VOICEMGR = conf.options.USE_VOICEMGR
conf.env.GOLDSOURCE_SUPPORT = conf.options.GOLDSOURCE_SUPPORT conf.env.GOLDSOURCE_SUPPORT = conf.options.GOLDSOURCE_SUPPORT
if conf.env.GOLDSOURCE_SUPPORT:
conf.check_cc(lib='dl')
if conf.env.USE_VGUI: if conf.env.USE_VGUI:
conf.load('vgui') conf.load('vgui')
if not conf.check_vgui(): if not conf.check_vgui():
@ -46,7 +50,7 @@ def build(bld):
'game_shared/voice_vgui_tweakdlg.cpp', 'game_shared/voice_vgui_tweakdlg.cpp',
'game_shared/voice_gamemgr.cpp', 'game_shared/voice_gamemgr.cpp',
'game_shared/voice_status.cpp'] 'game_shared/voice_status.cpp']
if bld.env.USE_VGUI: if bld.env.USE_VGUI:
defines += ['USE_VGUI'] defines += ['USE_VGUI']
libs += ['VGUI'] libs += ['VGUI']
@ -54,7 +58,7 @@ def build(bld):
defines += ['USE_NOVGUI_MOTD'] defines += ['USE_NOVGUI_MOTD']
else: else:
excluded_files += ['MOTD.cpp'] excluded_files += ['MOTD.cpp']
if bld.env.USE_NOVGUI_SCOREBOARD: if bld.env.USE_NOVGUI_SCOREBOARD:
defines += ['USE_NOVGUI_SCOREBOARD'] defines += ['USE_NOVGUI_SCOREBOARD']
else: else:

View File

@ -175,8 +175,6 @@ def configure(conf):
for i in a: for i in a:
conf.check_cc(lib = i) conf.check_cc(lib = i)
else: else:
if conf.env.GOLDSOURCE_SUPPORT:
conf.check_cc(lib='dl')
conf.check_cc(lib='m') conf.check_cc(lib='m')
# check if we can use C99 tgmath # check if we can use C99 tgmath