[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55191] trunk/blender/build_files/buildbot /slave_compile.py: Mixed paths to redist libraries in recent commit

Sergey Sharybin sergey.vfx at gmail.com
Mon Mar 11 15:16:42 CET 2013


Revision: 55191
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55191
Author:   nazgul
Date:     2013-03-11 14:16:41 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Mixed paths to redist libraries in recent commit

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/slave_compile.py

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2013-03-11 11:15:05 UTC (rev 55190)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2013-03-11 14:16:41 UTC (rev 55191)
@@ -156,9 +156,9 @@
         if retcode == 0:
             dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')
             if bitness == '32':
+               dlls_path = 'C:\\b\\redist\\x86'
+            else:
                dlls_path = 'C:\\b\\redist\\amd64'
-            else:
-               dlls_path = 'C:\\b\\redist\\x86'
             for dll in dlls:
                 shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
         sys.exit(retcode)




More information about the Bf-blender-cvs mailing list