From 0db8d95bc9ea4aea18a1c4d3acc6f57ee58d4b4e Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Tue, 29 May 2018 01:02:32 +0300
Subject: [PATCH] Update mainui. Add possibility to install engine ignoring
 *nix file hierarchy in wscript. Fix debugging.

---
 engine/wscript       |  6 ++++--
 game_launch/wscript  |  3 ++-
 mainui               |  2 +-
 vgui_support/wscript |  3 ++-
 wscript              | 16 ++++++++++++++++
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/engine/wscript b/engine/wscript
index 4b63c1b6..c53d26c8 100644
--- a/engine/wscript
+++ b/engine/wscript
@@ -68,7 +68,8 @@ def build(bld):
 			target   = 'xash',
 			features = 'c cprogram',
 			includes = includes,
-			use      = libs
+			use      = libs,
+			install_path = bld.env.BINDIR
 		)
 	else:
 		bld.shlib(
@@ -76,5 +77,6 @@ def build(bld):
 			target   = 'xash',
 			features = 'c',
 			includes = includes,
-			use      = libs
+			use      = libs,
+			install_path = bld.env.LIBDIR
 		)
diff --git a/game_launch/wscript b/game_launch/wscript
index f298b54d..38e58914 100644
--- a/game_launch/wscript
+++ b/game_launch/wscript
@@ -54,5 +54,6 @@ def build(bld):
 		target   = 'xash3d', # hl.exe
 		features = 'c cprogram',
 		includes = includes,
-		use      = libs
+		use      = libs,
+		install_path = bld.env.BINDIR
 	)
diff --git a/mainui b/mainui
index a1c3ad25..b82d68cc 160000
--- a/mainui
+++ b/mainui
@@ -1 +1 @@
-Subproject commit a1c3ad25311549999f67dd2a9bc8f5d153bf9355
+Subproject commit b82d68cc40b144a0114a76fa5dfabbc8e3fddf29
diff --git a/vgui_support/wscript b/vgui_support/wscript
index 65da5144..b4f59c29 100644
--- a/vgui_support/wscript
+++ b/vgui_support/wscript
@@ -67,4 +67,5 @@ def build(bld):
 		target   = 'vgui_support',
 		features = 'cxx',
 		includes = includes,
-		use      = libs)
+		use      = libs,
+		install_path = bld.env.LIBDIR)
diff --git a/wscript b/wscript
index afe3fc06..0aa3d3c7 100644
--- a/wscript
+++ b/wscript
@@ -41,6 +41,10 @@ def options(opt):
 	opt.add_option(
 		'--release', action = 'store_true', dest = 'RELEASE', default=False,
 		help = 'strip debug info from binary and enable optimizations')
+	
+	opt.add_option(
+		'--win-style-install', action = 'store_true', dest = 'WIN_INSTALL', default = False,
+		help = 'install like Windows build, ignore prefix, useful for development')
 
 	opt.recurse(SUBDIRS)
         
@@ -69,9 +73,12 @@ def configure(conf):
 	
 	if(conf.options.RELEASE):
 		conf.env.append_unique('CFLAGS', '-O2')
+		conf.env.append_unique('CXXFLAGS', '-O2')
 	else:
 		conf.env.append_unique('CFLAGS', '-Og')
 		conf.env.append_unique('CFLAGS', '-g')
+		conf.env.append_unique('CXXFLAGS', '-Og')
+		conf.env.append_unique('CXXFLAGS', '-g')
 		
 	conf.check( lib='dl' )
 	conf.check( lib='m' )
@@ -80,6 +87,15 @@ def configure(conf):
 	conf.env.DEDICATED     = conf.options.DEDICATED
 	conf.env.SINGLE_BINARY = conf.options.DEDICATED
 	
+	# indicate if we are packaging for Linux/BSD
+	if(not conf.options.WIN_INSTALL and 
+		conf.env.DEST_OS != 'win32' and 
+		conf.env.DEST_OS != 'darwin'):
+		conf.env.LIBDIR = conf.env.BINDIR = '${PREFIX}/lib/xash3d'
+	else:
+		# prefix is ignored
+		conf.env.LIBDIR = conf.env.BINDIR = '/'
+		
 	# global
 	conf.env.append_unique('XASH_BUILD_COMMIT', GIT_SHA)