diff options
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 9817defb93d..9c3eaf1b067 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -58,7 +58,7 @@ debug = False def getJavaVersion(): p = subprocess.Popen(javaCmd + " -version", shell = True, stdout = subprocess.PIPE, stderr = subprocess.STDOUT) if(p.wait() != 0): - print(javaCmd + " -version failed:\n" + p.stdout.read().strip()) + print(javaCmd + " -version failed:\n" + p.stdout.read().decode('UTF-8').strip()) sys.exit(1) matchVersion = re.compile('java version \"(.*)\"') m = matchVersion.match(p.stdout.readline().decode('UTF-8')) @@ -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": + if compiler != "VC90" and compiler != "VC100" and compiler != "VC110" and compiler != "VC120": compiler = "" if compiler == "": @@ -185,6 +185,8 @@ def getCppCompiler(): compiler = "VC100" elif l.find("Version 17") != -1: compiler = "VC110" + elif l.find("Version 18") != -1: + compiler = "VC120" else: print("Cannot detect C++ compiler") sys.exit(1) @@ -246,8 +248,11 @@ def configurePaths(): # Add compiler sub-directory if isWin32(): subdir = None - if getCppCompiler() == "VC110" and getMapping() != "py": - subdir = "vc110" + if getMapping() != "py": + if getCppCompiler() == "VC110": + subdir = "vc110" + elif getCppCompiler() == "VC120": + subdir = "vc120" if subdir: binDir = os.path.join(binDir, subdir) |