From f7773d499dcd1d9580616dd1ba03f7382ac44cae Mon Sep 17 00:00:00 2001
From: yg2f <yoann@terminajones.com>
Date: Wed, 26 Oct 2016 19:07:58 +0200
Subject: fix bug introduced by #6501

( @Akien : this PR is for current HEAD only, not to be cherry-picked for 2.1.1 )

this is manual revertion of #6501 which introduced a bug that prevented
scons from detecting Mingw under Windows when MSVC was installed.
(thanks to @vnen for finding this)

AND
it fixes the actual bug that prevented scons from detecting MSVC standalone
compiler ( a confusions between ``VSINSTALLDIR`` and ``VCINSTALLDIR`` )

The freeware Standalone MSVC C++ Build Tools are available here :
http://landinghub.visualstudio.com/visual-cpp-build-tools
---
 platform/windows/detect.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'platform')

diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index a5b26930be..7ae0100762 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -1,16 +1,11 @@
 #
-# 	tested on                   | Windows native    | Linux cross-compilation
-#	----------------------------+-------------------+---------------------------
-#	MSVS C++ 2010 Express       | WORKS             | n/a
+#   tested on                   | Windows native    | Linux cross-compilation
+#   ----------------------------+-------------------+---------------------------
 #   Visual C++ Build Tools 2015 | WORKS             | n/a
-#	Mingw-w64                   | WORKS             | WORKS
-#	Mingw-w32                   | WORKS             | WORKS
-#	MinGW                       | WORKS             | untested
-#
-#####
-# Notes about MSVS C++ :
-#
-# 	- MSVC2010-Express compiles to 32bits only.
+#   MSVS C++ 2010 Express       | WORKS             | n/a
+#   Mingw-w64                   | WORKS             | WORKS
+#   Mingw-w32                   | WORKS             | WORKS
+#   MinGW                       | WORKS             | untested
 #
 #####
 # Note about Visual C++ Build Tools :
@@ -19,6 +14,11 @@
 #		http://landinghub.visualstudio.com/visual-cpp-build-tools
 #
 #####
+# Notes about MSVS C++ :
+#
+# 	- MSVC2010-Express compiles to 32bits only.
+#
+#####
 # Notes about Mingw-w64 and Mingw-w32 under Windows :
 #
 #	- both can be installed using the official installer :
@@ -109,7 +109,7 @@ def can_build():
 
 	if (os.name=="nt"):
 		#building natively on windows!
-		if ( methods.msvc_is_detected() ):
+		if ( os.getenv("VCINSTALLDIR") ):
 			return True
 		else:
 			print("\nMSVC not detected, attempting Mingw.")
@@ -204,7 +204,7 @@ def configure(env):
 
 	env.Append(CPPPATH=['#platform/windows'])
 	env['is_mingw']=False
-	if (os.name=="nt" and methods.msvc_is_detected() ):
+	if (os.name=="nt" and os.getenv("VCINSTALLDIR") ):
 		#build using visual studio
 		env['ENV']['TMP'] = os.environ['TMP']
 		env.Append(CPPPATH=['#platform/windows/include'])
-- 
cgit v1.2.3