[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16878] trunk/blender/tools: * make sure we link against proper openmp library when using msvc

[Nathan Letwory]

Revision: 16878
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16878
Author:   jesterking
Date:     2008-10-02 08:11:47 +0200 (Thu, 02 Oct 2008)

Log Message:
-----------
* make sure we link against proper openmp library when using msvc
* return error code from makensis process instead of 0

Modified Paths:
--------------
    trunk/blender/tools/Blender.py
    trunk/blender/tools/btools.py

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2008-10-02 06:01:50 UTC (rev 16877)
+++ trunk/blender/tools/Blender.py	2008-10-02 06:11:47 UTC (rev 16878)
@@ -165,7 +165,10 @@
         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']:

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2008-10-02 06:01:50 UTC (rev 16877)
+++ trunk/blender/tools/btools.py	2008-10-02 06:11:47 UTC (rev 16878)
@@ -531,5 +531,5 @@
     data, err = proc.communicate()
     rv = proc.wait()
 
-    return 0
+    return err