diff options
| author | Ken Hughes <khughes@pacific.edu> | 2009-04-25 00:17:42 +0400 |
|---|---|---|
| committer | Ken Hughes <khughes@pacific.edu> | 2009-04-25 00:17:42 +0400 |
| commit | 6b48e25ba4c758d12620a4fe342101e079714ec3 (patch) | |
| tree | bef8af3e1e330987f3ae1abb8279b5fa1449eec2 /tools/Blender.py | |
| parent | 252928ab36b03e73b35ea79e36a03e8f982274f6 (diff) | |
Change scon's ordering of static libraries to resolve problem on Linux 64-bit builds.
Diffstat (limited to 'tools/Blender.py')
| -rw-r--r-- | tools/Blender.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 9c978fccf49..7f9df068754 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -126,8 +126,6 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_SDL_LIBPATH']) if lenv['WITH_BF_FFMPEG']: 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']: @@ -141,6 +139,8 @@ def setup_staticlibs(lenv): statlibs += Split(lenv['BF_OPENAL_LIB_STATIC']) if lenv['WITH_BF_STATICOPENGL']: statlibs += Split(lenv['BF_OPENGL_LIB_STATIC']) + if lenv['WITH_BF_STATICCXX']: + statlibs += Split(lenv['BF_CXX_LIB_STATIC']) if lenv['WITH_BF_PYTHON'] and lenv['WITH_BF_STATICPYTHON']: statlibs += Split(lenv['BF_PYTHON_LIB_STATIC']) |