Changeset View
Changeset View
Standalone View
Standalone View
blueprints/libs/runtime/runtime.py
| Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s) | 43 | if CraftCore.compiler.isMinGW_W32(): | |||
|---|---|---|---|---|---|
| 44 | files.append('libgcc_s_sjlj-1.dll') | 44 | files.append('libgcc_s_sjlj-1.dll') | ||
| 45 | srcdir = os.path.join(self.rootdir, "mingw", "bin") | 45 | srcdir = os.path.join(self.rootdir, "mingw", "bin") | ||
| 46 | elif CraftCore.compiler.isMinGW_W64(): | 46 | elif CraftCore.compiler.isMinGW_W64(): | ||
| 47 | files.append('libgcc_s_seh-1.dll') | 47 | files.append('libgcc_s_seh-1.dll') | ||
| 48 | srcdir = os.path.join(self.rootdir, "mingw64", "bin") | 48 | srcdir = os.path.join(self.rootdir, "mingw64", "bin") | ||
| 49 | elif CraftCore.compiler.isMSVC(): | 49 | elif CraftCore.compiler.isMSVC(): | ||
| 50 | if self.buildType() != "Debug": | 50 | if self.buildType() != "Debug": | ||
| 51 | if CraftCore.compiler.isMSVC2017(): | 51 | if CraftCore.compiler.isMSVC2017(): | ||
| 52 | redistDir = os.environ["VCTOOLSREDISTDIR"] | 52 | if "VCTOOLSREDISTDIR" in os.environ: | ||
| 53 | redistDir = os.environ["VCTOOLSREDISTDIR"] | ||||
| 54 | else: | ||||
| 55 | CraftCore.log.error("Could not find Mycrosoft Visual Studio 2017.\nVCTOOLSREDISTDIR does not exist, and should point to '*\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\xx.xx.xxxxx'.") | ||||
| 53 | elif CraftCore.compiler.isMSVC2015(): | 56 | elif CraftCore.compiler.isMSVC2015(): | ||
| 54 | redistDir = os.path.join(os.environ["VCINSTALLDIR"], "redist") | 57 | if "VCINSTALLDIR" in os.environ: | ||
| 58 | redistDir = os.path.join(os.environ["VCINSTALLDIR"], "redist") | ||||
| 59 | else: | ||||
| 60 | CraftCore.log.error("Could not find Mycrosoft Visual Studio 2015.\nVCINSTALLDIR does not exist, and should point to '*\Microsoft Visual Studio\2017\Community\VC\'.") | ||||
vonreth: 2017? | |||||
patrickelectric: Fixed ! | |||||
| 55 | if redistDir: | 61 | if redistDir: | ||
| 56 | files = glob.glob(os.path.join(redistDir, CraftCore.compiler.architecture, "**/*.dll"), recursive=True) | 62 | files = glob.glob(os.path.join(redistDir, CraftCore.compiler.architecture, "**/*.dll"), recursive=True) | ||
| 57 | else: | 63 | else: | ||
| 58 | CraftCore.log.error("Unsupported Compiler") | 64 | CraftCore.log.error("Unsupported Compiler") | ||
| 59 | return False | 65 | return False | ||
| 60 | for f in files: | 66 | for f in files: | ||
| 61 | if not os.path.isabs(f): | 67 | if not os.path.isabs(f): | ||
| 62 | f = os.path.join(srcdir, f) | 68 | f = os.path.join(srcdir, f) | ||
| Show All 10 Lines | |||||
2017?