From 09a158f2e77c6b6985a28937f23d4d1073cc80dd Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 11 Mar 2024 00:53:44 +0300 Subject: [PATCH] wscript: move libdl check into client, as it's the only subproject that uses it --- cl_dll/wscript | 8 ++++++-- wscript | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cl_dll/wscript b/cl_dll/wscript index e776a54d..b500150c 100644 --- a/cl_dll/wscript +++ b/cl_dll/wscript @@ -27,6 +27,10 @@ def configure(conf): conf.env.USE_NOVGUI_SCOREBOARD = conf.options.USE_NOVGUI_SCOREBOARD conf.env.USE_VOICEMGR = conf.options.USE_VOICEMGR conf.env.GOLDSOURCE_SUPPORT = conf.options.GOLDSOURCE_SUPPORT + + if conf.env.GOLDSOURCE_SUPPORT: + conf.check_cc(lib='dl') + if conf.env.USE_VGUI: conf.load('vgui') if not conf.check_vgui(): @@ -46,7 +50,7 @@ def build(bld): 'game_shared/voice_vgui_tweakdlg.cpp', 'game_shared/voice_gamemgr.cpp', 'game_shared/voice_status.cpp'] - + if bld.env.USE_VGUI: defines += ['USE_VGUI'] libs += ['VGUI'] @@ -54,7 +58,7 @@ def build(bld): defines += ['USE_NOVGUI_MOTD'] else: excluded_files += ['MOTD.cpp'] - + if bld.env.USE_NOVGUI_SCOREBOARD: defines += ['USE_NOVGUI_SCOREBOARD'] else: diff --git a/wscript b/wscript index 6163e793..eae81555 100644 --- a/wscript +++ b/wscript @@ -175,8 +175,6 @@ def configure(conf): for i in a: conf.check_cc(lib = i) else: - if conf.env.GOLDSOURCE_SUPPORT: - conf.check_cc(lib='dl') conf.check_cc(lib='m') # check if we can use C99 tgmath