Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'tools/Blender.py')
-rw-r--r--tools/Blender.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/Blender.py b/tools/Blender.py
index 8a2ef93bb26..94ad485e176 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -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):
@@ -211,6 +218,10 @@ def setup_syslibs(lenv):
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']