client: fix VGUI include and lib path detection

cl_dll/hud.h

@@ -91,7 +91,7 @@ struct HUDLIST {
 //
 //-----------------------------------------------------
 //
-#include "..\game_shared\voice_status.h"
+#include "voice_status.h"
 #include "hud_spectator.h"
 
 

cl_dll/wscript

@@ -9,7 +9,6 @@ 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')

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]')