diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-09-18 07:05:02 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-09-18 07:05:02 +0400 |
commit | 8d1163c639253e76fec3f69fead716a51068ea37 (patch) | |
tree | 8e72786b11aaef86cbe0a6459dec908a5864065d /tools | |
parent | beb7738a299579e771295e013961ef3af139d1e5 (diff) |
scons options BF_CXX, WITH_BF_STATICCXX, BF_CXX_LIB_STATIC for static linking to stdc++ because of problems running blender on some systems.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Blender.py | 3 | ||||
-rwxr-xr-x | tools/btools.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index b5f32f24551..2a63ca5b697 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -120,7 +120,8 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_FFMPEG_LIBPATH']) - + if lenv['WITH_BF_STATICCXX']: + statlibs += Split(lenv['BF_CXX_LIB_STATIC']) if lenv['WITH_BF_OPENEXR']: libincs += Split(lenv['BF_OPENEXR_LIBPATH']) if lenv['WITH_BF_STATICOPENEXR']: diff --git a/tools/btools.py b/tools/btools.py index be23b1d7024..ffefef06a5a 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -55,8 +55,9 @@ def validate_arguments(args, bc): 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS', 'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', - 'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE', - 'BF_VERSE_INCLUDE', + 'BF_PROFILE_FLAGS', 'LCGDIR', + 'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC' + 'WITH_BF_VERSE', 'BF_VERSE_INCLUDE', 'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO', 'BF_TWEAK_MODE', 'BF_SPLIT_SRC', 'WITHOUT_BF_INSTALL', @@ -256,6 +257,9 @@ def read_opts(cfg, args): ('BF_SOLID_INC', 'Solid include path', ''), ('BF_WINTAB', 'WinTab base dir', ''), ('BF_WINTAB_INC', 'WinTab include dir', ''), + ('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''), + ('WITH_BF_STATICCXX', 'static link to stdc++', 'false'), + ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''), ## ##WITH_BF_NSPR = 'true' ##BF_NSPR = $(LCGDIR)/nspr |