From d0451fea5811d2922bb51fbc48c5c7317d81dfaf Mon Sep 17 00:00:00 2001 From: Ken Hughes Date: Tue, 21 Sep 2010 21:10:49 +0000 Subject: Changes to scons for building with static zlib and tiff libraries. --- build_files/scons/tools/Blender.py | 18 +++++++++++------- build_files/scons/tools/btools.py | 8 ++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) (limited to 'build_files') diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 3748a3b02c2..10583c03fac 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -129,8 +129,8 @@ def setup_staticlibs(lenv): libincs.extend([ lenv['BF_OPENGL_LIBPATH'], lenv['BF_JPEG_LIBPATH'], - lenv['BF_PNG_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], + lenv['BF_PNG_LIBPATH'], lenv['BF_LIBSAMPLERATE_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ]) @@ -152,6 +152,10 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_LCMS_LIBPATH']) if lenv['WITH_BF_TIFF']: libincs += Split(lenv['BF_TIFF_LIBPATH']) + if lenv['WITH_BF_STATICTIFF']: + statlibs += Split(lenv['BF_TIFF_LIB_STATIC']) + if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']: + statlibs += Split(lenv['BF_ZLIB_LIB_STATIC']) if lenv['WITH_BF_FFTW3']: libincs += Split(lenv['BF_FFTW3_LIBPATH']) if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']: @@ -198,7 +202,6 @@ def setup_syslibs(lenv): lenv['BF_JPEG_LIB'], lenv['BF_PNG_LIB'], - lenv['BF_ZLIB_LIB'], lenv['BF_LIBSAMPLERATE_LIB'] ] @@ -221,11 +224,12 @@ def setup_syslibs(lenv): syslibs += ['gomp'] if lenv['WITH_BF_ICONV']: syslibs += Split(lenv['BF_ICONV_LIB']) - if lenv['WITH_BF_OPENEXR']: - if not lenv['WITH_BF_STATICOPENEXR']: - syslibs += Split(lenv['BF_OPENEXR_LIB']) - if lenv['WITH_BF_TIFF']: - syslibs += Split(lenv['BF_TIFF_LIB']) + if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']: + syslibs += Split(lenv['BF_OPENEXR_LIB']) + if lenv['WITH_BF_TIFF'] and not lenv['WITH_BF_STATICTIFF']: + syslibs += Split(lenv['BF_TIFF_LIB']) + if lenv['WITH_BF_ZLIB'] and not lenv['WITH_BF_STATICZLIB']: + syslibs += Split(lenv['BF_ZLIB_LIB']) if lenv['WITH_BF_FFMPEG'] and not lenv['WITH_BF_STATICFFMPEG']: syslibs += Split(lenv['BF_FFMPEG_LIB']) if lenv['WITH_BF_OGG']: diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 563b3d42f5c..da916a8e89c 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -52,8 +52,8 @@ def validate_arguments(args, bc): 'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH', 'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH', 'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', - 'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', - 'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', + 'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', 'WITH_BF_STATICTIFF', 'BF_TIFF_LIB_STATIC', + 'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', 'WITH_BF_STATICZLIB', 'BF_ZLIB_LIB_STATIC', 'WITH_BF_INTERNATIONAL', 'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH', 'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH', @@ -278,10 +278,12 @@ def read_opts(env, cfg, args): ('BF_PNG_LIBPATH', 'PNG library path', ''), (BoolVariable('WITH_BF_TIFF', 'Use TIFF if true', True)), + (BoolVariable('WITH_BF_STATICTIFF', 'Staticly link to TIFF', False)), ('BF_TIFF', 'TIFF base path', ''), ('BF_TIFF_INC', 'TIFF include path', ''), ('BF_TIFF_LIB', 'TIFF library', ''), ('BF_TIFF_LIBPATH', 'TIFF library path', ''), + ('BF_TIFF_LIB_STATIC', 'TIFF static library', ''), (BoolVariable('WITH_BF_LCMS', 'Enable color correction with lcms', False)), ('BF_LCMS', 'LCMS base path', ''), @@ -290,10 +292,12 @@ def read_opts(env, cfg, args): ('BF_LCMS_LIBPATH', 'LCMS library path', ''), (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)), + (BoolVariable('WITH_BF_STATICZLIB', 'Staticly link to ZLib', False)), ('BF_ZLIB', 'ZLib base path', ''), ('BF_ZLIB_INC', 'ZLib include path', ''), ('BF_ZLIB_LIB', 'ZLib library', ''), ('BF_ZLIB_LIBPATH', 'ZLib library path', ''), + ('BF_ZLIB_LIB_STATIC', 'ZLib static library', ''), (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Gettext if true', True)), -- cgit v1.2.3