Merge from trunk -r 23968:24181.
[blender.git] / tools / Blender.py
index 8a2ef93bb26bee0e027088a11c02b3bb38acc787..2b3f405ed8b205ad5afb270a52cae9d359687348 100644 (file)
@@ -161,6 +161,13 @@ 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'])
+               if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+                       libincs += Split(lenv['BF_PCRE_LIBPATH'])
+                       libincs += Split(lenv['BF_EXPAT_LIBPATH'])
+
+
        return statlibs, libincs
 
 def setup_syslibs(lenv):
@@ -209,8 +216,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_PCRE_LIB'])
+               syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
+               syslibs.append(lenv['BF_EXPAT_LIB'])
 
 
        syslibs += lenv['LLIBS']