diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 11 | ||||
| -rwxr-xr-x | tools/btools.py | 16 |
2 files changed, 27 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'] diff --git a/tools/btools.py b/tools/btools.py index cacff349dcf..4f554a6901b 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -53,6 +53,7 @@ def validate_arguments(args, bc): 'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH', 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', + 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH', 'WITH_BF_PLAYER', 'WITH_BF_NOBLENDER', 'WITH_BF_BINRELOC', @@ -333,6 +334,21 @@ def read_opts(cfg, args): ('BF_OPENGL_LIBPATH', 'OpenGL library path', ''), ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''), ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''), + + (BoolVariable('WITH_BF_COLLADA', 'Build COLLADA import/export module if true', True)), + ('BF_COLLADA', 'COLLADA base path', ''), + ('BF_COLLADA_INC', 'COLLADA include path', ''), + ('BF_COLLADA_LIB', 'COLLADA library', ''), + ('BF_OPENCOLLADA', 'OpenCollada base path', ''), + ('BF_OPENCOLLADA_INC', 'OpenCollada base include path', ''), + ('BF_OPENCOLLADA_LIB', 'OpenCollada library', ''), + ('BF_OPENCOLLADA_LIBPATH', 'OpenCollada library path', ''), + ('BF_PCRE', 'PCRE base path', ''), + ('BF_PCRE_LIB', 'PCRE library', ''), + ('BF_PCRE_LIBPATH', 'PCRE library path', ''), + ('BF_EXPAT', 'Expat base path', ''), + ('BF_EXPAT_LIB', 'Expat library', ''), + ('BF_EXPAT_LIBPATH', 'Expat library path', ''), (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)), (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)), |