diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-15 16:05:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-15 16:05:42 +0400 |
| commit | db01d290e7c95bd147a297e4996171e76908c9aa (patch) | |
| tree | 4ec655fd8b5cf45cc415b79c04398e863f52d70e /build_files/scons/tools | |
| parent | 20b5e1f7b859c38bfcb52891d3427c5ed826b1c8 (diff) | |
Compilation error fix when using scons
OpenEXR libraries shall go after OpenImageIO,
otherwise it'll fail to find symbols needed
for OIIO.
Diffstat (limited to 'build_files/scons/tools')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 24bdd32ed26..ee2399500d0 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -151,12 +151,6 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_JACK_LIBPATH']) if lenv['WITH_BF_SNDFILE']: libincs += Split(lenv['BF_SNDFILE_LIBPATH']) - if lenv['WITH_BF_OPENEXR']: - libincs += Split(lenv['BF_OPENEXR_LIBPATH']) - if lenv['WITH_BF_STATICOPENEXR']: - statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) - if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']: - statlibs += Split(lenv['BF_ZLIB_LIB_STATIC']) if lenv['WITH_BF_TIFF']: libincs += Split(lenv['BF_TIFF_LIBPATH']) if lenv['WITH_BF_STATICTIFF']: @@ -212,6 +206,12 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_OIIO_LIBPATH']) if lenv['WITH_BF_STATICOIIO']: statlibs += Split(lenv['BF_OIIO_LIB_STATIC']) + if lenv['WITH_BF_OPENEXR']: + libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + if lenv['WITH_BF_STATICOPENEXR']: + statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) + if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']: + statlibs += Split(lenv['BF_ZLIB_LIB_STATIC']) if lenv['WITH_BF_OCIO']: libincs += Split(lenv['BF_OCIO_LIBPATH']) |