From 76e01f490c9654faee7d3726408ac8920379d213 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Tue, 19 Jun 2018 16:17:27 +0300
Subject: [PATCH] Update mainui. Make VGUI search message more friendly. Update
 gitignore

---
 .gitignore           |  1 +
 mainui               |  2 +-
 vgui_support/wscript | 13 ++++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index cac86b0e..e56161d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -313,5 +313,6 @@ build-*
 *.files
 
 # Waf
+build_current
 .waf-*
 .lock-waf*
diff --git a/mainui b/mainui
index a61e1845..0c354a1d 160000
--- a/mainui
+++ b/mainui
@@ -1 +1 @@
-Subproject commit a61e18458446f54fca061b5040628aae407144c1
+Subproject commit 0c354a1d9c6a7443f85ba4c7a8f93141420f281d
diff --git a/vgui_support/wscript b/vgui_support/wscript
index b4f59c29..66dcaeae 100644
--- a/vgui_support/wscript
+++ b/vgui_support/wscript
@@ -19,15 +19,19 @@ def configure(conf):
 	if conf.options.DEDICATED:
 		return
 
+	conf.start_msg('Checking for VGUI')
+
 	if not conf.options.VGUI_DEV:
+		conf.end_msg('no')
 		conf.fatal("Provide a path to vgui-dev repository using --vgui key")
 
-	if conf.env.DEST_CPU != 'x86' and not (conf.env.DEST_CPU == 'x86_64' and not conf.options.ALLOW64): # multilib case
+	if conf.env.DEST_CPU != 'x86' and not (conf.env.DEST_CPU == 'x86_64' and not conf.options.ALLOW64):
+		conf.end_msg('no')
 		conf.fatal('vgui is not supported on this CPU: ' + conf.env.DEST_CPU)
 
 	if conf.env.DEST_OS == 'win32':
-                conf.env.LIB_VGUI = ['vgui.lib']
-                conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib/win32_vc6/'))]
+		conf.env.LIB_VGUI = ['vgui.lib']
+		conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib/win32_vc6/'))]
 	else:
 		if conf.env.DEST_OS == 'linux':
 			conf.env.LIB_VGUI = [':vgui.so']
@@ -39,8 +43,7 @@ def configure(conf):
         conf.env.INCLUDES_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'include'))]
 
 	conf.env.HAVE_VGUI = 1
-
-	conf.msg('Checking VGUI', '{0}, {1}, {2}'.format(conf.env.LIB_VGUI, conf.env.LIBPATH_VGUI, conf.env.INCLUDES_VGUI))
+	conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env.LIB_VGUI, conf.env.LIBPATH_VGUI, conf.env.INCLUDES_VGUI))
 
 def get_subproject_name(ctx):
 	return os.path.basename(os.path.realpath(str(ctx.path)))