diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
| commit | c8b4cf92067ffeb625aa39003baf5d8f7c3f0025 (patch) | |
| tree | c6c50dbc3d90a65fca6c1ca56a93e4a57cf7e154 /tools/Blender.py | |
| parent | e93db433a086a3e739c0f4026cd500f0b595b0f1 (diff) | |
| parent | d76a6f5231c015c35123d22e1f5c3ffcdfbf9bbd (diff) | |
2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD
Notes:
* Game and sequencer RNA, and sequencer header are now out of date
a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
not needed anymore.
* Fix "duplicate strip" always increase the user count for ipo.
* IPO pinning on sequencer strips was lost during Undo.
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 ce5570ebd45..bb82f9caa1d 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']: @@ -140,6 +138,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']) |