diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-08-24 17:08:14 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-08-24 17:08:14 +0400 |
| commit | 446122d112daeb6f6f89d5b7df47dd3a386bc748 (patch) | |
| tree | 2f6e1fae19e893f352fe34ffce05046b23a023ef /build_files | |
| parent | 22e1ca4134451224129804d80fd208047a29d5c1 (diff) | |
== SCons ==
Make it possible to link statically against libgettext. Set WITH_BF_GETTEXT_STATIC to True and put static lib in BF_GETTEXT_LIB_STATIC (absolute path works probably best). BF_GETTEXT_LIB will be ignored.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 4 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 89c4ef9cac9..e16c550cc72 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -155,6 +155,8 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_FFTW3_LIBPATH']) if lenv['WITH_BF_INTERNATIONAL']: libincs += Split(lenv['BF_GETTEXT_LIBPATH']) + if lenv['WITH_BF_GETTEXT_STATIC']: + statlibs += Split(lenv['BF_GETTEXT_LIB_STATIC']) if lenv['WITH_BF_OPENAL']: libincs += Split(lenv['BF_OPENAL_LIBPATH']) if lenv['WITH_BF_STATICOPENAL']: @@ -201,7 +203,7 @@ def setup_syslibs(lenv): syslibs.append(lenv['BF_PYTHON_LIB']+'_d') else: syslibs.append(lenv['BF_PYTHON_LIB']) - if lenv['WITH_BF_INTERNATIONAL']: + if lenv['WITH_BF_INTERNATIONAL'] and not lenv['WITH_BF_GETTEXT_STATIC']: syslibs += Split(lenv['BF_GETTEXT_LIB']) if lenv['WITH_BF_OPENAL']: if not lenv['WITH_BF_STATICOPENAL']: diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index c930c150cb6..f5f7bd438d5 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -46,7 +46,7 @@ def validate_arguments(args, bc): '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_INTERNATIONAL', - 'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'BF_GETTEXT_LIBPATH', + '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', 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB', 'BF_WINTAB', 'BF_WINTAB_INC', @@ -289,6 +289,8 @@ def read_opts(env, cfg, args): ('BF_GETTEXT', 'gettext base path', ''), ('BF_GETTEXT_INC', 'gettext include path', ''), ('BF_GETTEXT_LIB', 'gettext library', ''), + (BoolVariable('WITH_BF_GETTEXT_STATIC', 'Use static gettext library if true', False)), + ('BF_GETTEXT_LIB_STATIC', 'static gettext library', ''), ('BF_GETTEXT_LIBPATH', 'gettext library path', ''), (BoolVariable('WITH_BF_ICONV', 'Use iconv if true', True)), |