Several Windows build fixes:

	ICE-3420 - Force link failure for debug/release mismatch?
        Update VS add-in to not add C++ libraries
        Fixed WinRT builds
        Fixed Python Windows builds

1 files changed, 5 insertions, 6 deletions

diff --git a/demoscript/Util.py b/demoscript/Util.py
index 7489ef6e022..d7b01784db2 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -170,7 +170,7 @@ def getCppCompiler():
             config = open(os.path.join(toplevel, "config", "Make.rules.mak"), "r")
         if config != None:
             compiler = re.search("CPP_COMPILER[\t\s]*= ([A-Z0-9]*)", config.read()).group(1)
-            if compiler != "VC90" and compiler != "VC100" and compiler != "VC110" and compiler != "VC120":
+            if compiler != "VC100" and compiler != "VC110" and compiler != "VC120":
                 compiler = ""
 
         if compiler == "":
@@ -179,9 +179,7 @@ def getCppCompiler():
                 print("Cannot detect C++ compiler")
                 sys.exit(1)
             l = p.stdout.readline().decode("utf-8").strip()
-            if l.find("Version 15") != -1:
-                compiler = "VC90"
-            elif l.find("Version 16") != -1:
+            if l.find("Version 16") != -1:
                 compiler = "VC100"
             elif l.find("Version 17") != -1:
                 compiler = "VC110"
@@ -251,8 +249,6 @@ def configurePaths():
             if getMapping() != "py":
                 if getCppCompiler() == "VC110":
                     subdir = "vc110"
-                elif getCppCompiler() == "VC120":
-                    subdir = "vc120"
 
             if subdir:
                 binDir = os.path.join(binDir, subdir)
@@ -372,6 +368,9 @@ def getIceDir(subdir = None):
     else:
         return toplevel
 
+def isBinDist():
+    getIceDir() != os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+
 def isWin32():
     return sys.platform == "win32"