Merge with 2.5 -r 21003:21788.
[blender.git] / tools / Blender.py
index 749fa55a83332b1174be67f0881f55752ef94993..613979dc359708afa5d2e86c45c9fbce4e8d3f1f 100644 (file)
@@ -148,6 +148,12 @@ def setup_staticlibs(lenv):
        if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
                libincs += Split(lenv['BF_PTHREADS_LIBPATH'])
 
+       if lenv['WITH_BF_COLLADA']:
+               libincs += Split(lenv['BF_OPENCOLLADA_LIBPATH'])
+               libincs += Split(lenv['BF_PCRE_LIBPATH'])
+        libincs += Split(lenv['BF_EXPAT_LIBPATH'])
+
+
        return statlibs, libincs
 
 def setup_syslibs(lenv):
@@ -189,8 +195,13 @@ def setup_syslibs(lenv):
                syslibs += Split(lenv['BF_OPENGL_LIB'])
        if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc'):
                syslibs += Split(lenv['BF_PTHREADS_LIB'])
+
        if lenv['WITH_BF_LCMS']:
                syslibs.append(lenv['BF_LCMS_LIB'])
+       if lenv['WITH_BF_COLLADA']:
+               syslibs.append(lenv['BF_OPENCOLLADA_LIB'])
+               syslibs.append(lenv['BF_PCRE_LIB'])
+        syslibs.append(lenv['BF_EXPAT_LIB'])
 
 
        syslibs += lenv['LLIBS']