[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43555] trunk/blender/build_files/scons/ tools/Blender.py: fix for scons/linux with opencollada debug libs

Campbell Barton ideasman42 at gmail.com
Fri Jan 20 13:32:25 CET 2012


Revision: 43555
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43555
Author:   campbellbarton
Date:     2012-01-20 12:32:11 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
fix for scons/linux with opencollada debug libs

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2012-01-20 07:43:46 UTC (rev 43554)
+++ trunk/blender/build_files/scons/tools/Blender.py	2012-01-20 12:32:11 UTC (rev 43555)
@@ -272,7 +272,7 @@
         syslibs += Split(lenv['BF_PTHREADS_LIB'])
     if lenv['WITH_BF_COLLADA']:
         syslibs.append(lenv['BF_PCRE_LIB'])
-        if lenv['BF_DEBUG']:
+        if lenv['BF_DEBUG'] and (lenv['OURPLATFORM'] != 'linux'):
             syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
         else:
             syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])



More information about the Bf-blender-cvs mailing list