* make sure we link against proper openmp library when using msvc

* return error code from makensis process instead of 0
2008-10-02 06:11:47 +00:00
parent 3659b390bf
commit 59eaf36f97
2 changed files with 5 additions and 2 deletions
--- 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']: