* make sure we link against proper openmp library when using msvc
authorNathan Letwory <nathan@letworyinteractive.com>
Thu, 2 Oct 2008 06:11:47 +0000 (06:11 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Thu, 2 Oct 2008 06:11:47 +0000 (06:11 +0000)
* return error code from makensis process instead of 0

tools/Blender.py
tools/btools.py

index 8f565174b0e0d0d8602de8e70dcbfe0233c98bef..47bc5e9fa722f3670591290ac3af99b461964c91 100644 (file)
@@ -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']:
index 8fb38646432d92535a726c9c1be70121c40ac113..f094cfbd5509ea65d35b81376bf36a96dda27561 100755 (executable)
@@ -531,5 +531,5 @@ def NSIS_Installer(target=None, source=None, env=None):
     data, err = proc.communicate()
     rv = proc.wait()
 
-    return 0
+    return err