From 5bb2221c621eab45e5e4b716f2d1100f41529aa6 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 6 Sep 2023 22:53:40 +0300 Subject: [PATCH] client: fix VGUI include and lib path detection --- cl_dll/hud.h | 2 +- cl_dll/wscript | 7 +++---- scripts/waifulib/vgui.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cl_dll/hud.h b/cl_dll/hud.h index f18d6e0..17d1379 100644 --- a/cl_dll/hud.h +++ b/cl_dll/hud.h @@ -91,7 +91,7 @@ struct HUDLIST { // //----------------------------------------------------- // -#include "..\game_shared\voice_status.h" +#include "voice_status.h" #include "hud_spectator.h" diff --git a/cl_dll/wscript b/cl_dll/wscript index 4d9ade5..499ef3b 100644 --- a/cl_dll/wscript +++ b/cl_dll/wscript @@ -9,10 +9,9 @@ def options(opt): opt.load('vgui') def configure(conf): - if conf.env.USE_VGUI: - conf.load('vgui') - if not conf.check_vgui(): - conf.fatal('VGUI was enabled but VGUI cannot be used') + conf.load('vgui') + if not conf.check_vgui(): + conf.fatal('VGUI was enabled but VGUI cannot be used') def build(bld): libs = ['VGUI'] diff --git a/scripts/waifulib/vgui.py b/scripts/waifulib/vgui.py index 7f1b5a6..b51bd47 100644 --- a/scripts/waifulib/vgui.py +++ b/scripts/waifulib/vgui.py @@ -13,7 +13,7 @@ int main() { return 0; }''' def options(opt): grp = opt.add_option_group('VGUI options') - vgui_dev_path = os.path.join(opt.path.path_from(opt.path), 'vgui_support', 'vgui-dev') + vgui_dev_path = os.path.join(opt.path.path_from(opt.path), 'utils', 'vgui') grp.add_option('--vgui', action = 'store', dest = 'VGUI_DEV', default=vgui_dev_path, help = 'path to vgui-dev repo [default: %default]')