diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Blender.py | 5 | ||||
-rwxr-xr-x | tools/btools.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 8f565174b0e..47bc5e9fa72 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -165,7 +165,10 @@ def setup_syslibs(lenv): if not lenv['WITH_BF_STATICOPENAL']: syslibs += Split(lenv['BF_OPENAL_LIB']) if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc': - syslibs += ['gomp'] + if lenv['CC'] == 'cl.exe': + syslibs += ['vcomp'] + else: + syslibs += ['gomp'] if lenv['WITH_BF_ICONV']: syslibs += Split(lenv['BF_ICONV_LIB']) if lenv['WITH_BF_OPENEXR']: diff --git a/tools/btools.py b/tools/btools.py index 8fb38646432..f094cfbd550 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -531,5 +531,5 @@ def NSIS_Installer(target=None, source=None, env=None): data, err = proc.communicate() rv = proc.wait() - return 0 + return err |