From 39f11dddb5dea5aa611fdb92bab6591851cc84eb Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Sat, 16 Sep 2017 13:12:36 -0400
Subject: [PATCH] Fix scons+cl build

---
 SConstruct               | 38 +++++++++++++++++++-------------------
 rsrc/SConscript          |  2 +-
 src/dialogxml/SConscript |  3 ++-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/SConstruct b/SConstruct
index 8e26e448..2e52245d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -50,7 +50,7 @@ else:
 	""")
 
 if str(platform) == "darwin":
-	env.Append(CXXFLAGS="-std=c++11 -stdlib=libc++ -include src/global.hpp", RPATH='../Frameworks')
+	env.Append(CXXFLAGS="-std=c++11 -stdlib=libc++ -include global.hpp", RPATH='../Frameworks')
 	env["CC"] = 'clang'
 	env["CXX"] = 'clang++'
 	env.Append(BUILDERS={
@@ -134,7 +134,7 @@ elif str(platform) == "win32":
 	if 'msvc' in env['TOOLS']:
 		env.Append(
 			LINKFLAGS='/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup /MACHINE:X86',
-			CXXFLAGS='/EHsc /MD /FIsrc/global.hpp',
+			CXXFLAGS='/EHsc /MD /FIglobal.hpp',
 			LIBPATH=("C:\Program Files (x86)\Microsoft Visual Studio " + env['MSVC_VERSION'] + "\VC\lib"),
 			LIBS=Split("""
 				kernel32
@@ -196,6 +196,23 @@ if path.exists('deps/lib'):
 if path.exists('deps/include'):
 	env.Append(CPPPATH='deps/include')
 
+# Include directories
+
+env.Append(CPPPATH=Split("""
+	#src/
+	#src/classes/
+	#src/tools/
+	#src/fileio/
+	#src/fileio/gzstream/
+	#src/fileio/resmgr/
+	#src/fileio/xml-parser/
+	#src/gfx/
+	#src/dialogxml/dialogs/
+	#src/dialogxml/widgets/
+	#src/scenario/
+	#src/universe/
+"""))
+
 env['CONFIGUREDIR'] = '#build/conf'
 env['CONFIGURELOG'] = '#build/conf/config.log'
 if not env.GetOption('clean'):
@@ -260,23 +277,6 @@ if not env.GetOption('clean'):
 
 env.Append(CPPDEFINES="TIXML_USE_TICPP")
 
-# Include directories
-
-env.Append(CPPPATH=Split("""
-	#src/
-	#src/classes/
-	#src/tools/
-	#src/fileio/
-	#src/fileio/gzstream/
-	#src/fileio/resmgr/
-	#src/fileio/xml-parser/
-	#src/gfx/
-	#src/dialogxml/dialogs/
-	#src/dialogxml/widgets/
-	#src/scenario/
-	#src/universe/
-"""))
-
 if str(platform) == "win32":
 	# For the *resource.h headers
 	env.Append(CPPPATH="#rsrc/menus")
diff --git a/rsrc/SConscript b/rsrc/SConscript
index ed7b4ac6..fec50826 100644
--- a/rsrc/SConscript
+++ b/rsrc/SConscript
@@ -15,7 +15,7 @@ env.Install(path.join(data_dir, "graphics"), Glob("graphics/*.png"))
 env.Install(path.join(data_dir, "sounds"), Glob("sounds/*.WAV"))
 env.Install(path.join(data_dir, "strings"), Glob("strings/*.txt"))
 
-env.Install(path.join(data_dir, "shaders"), Glob("#src/tools/mask.*"))
+env.Install(path.join(data_dir, "shaders"), Glob("#src/gfx/mask.*"))
 
 # Scenarios
 
diff --git a/src/dialogxml/SConscript b/src/dialogxml/SConscript
index 2f8e28f3..bc8772b0 100644
--- a/src/dialogxml/SConscript
+++ b/src/dialogxml/SConscript
@@ -2,7 +2,8 @@
 Import("env")
 
 env = env.Clone()
-env.Append(CXXFLAGS="-fpermissive")
+if 'msvc' not in env["TOOLS"]:
+	env.Append(CXXFLAGS="-fpermissive")
 dlog_util = env.StaticLibrary("#build/lib/dlogutil", Glob("dialogs/*.cpp") + Glob("widgets/*.cpp") + Glob("../fileio/xml-parser/*.cpp"))
 
 Return("dlog_util")
\ No newline at end of file