diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-10-05 03:44:03 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-10-05 03:44:03 +0400 |
| commit | 3eba19881894c17d2645f9e9723eae1be822e55a (patch) | |
| tree | ae6cc8b1918300a719cbadac09c0ba6f188b5477 /intern | |
| parent | fedc8e17223cc5490d465788cac211328a712e5f (diff) | |
* Fix Scons build when OCIO is disabled.
Still fails when it's enabled though (unresolved symbols).
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/opencolorio/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/opencolorio/SConscript b/intern/opencolorio/SConscript index 229087a568d..a4d21f3e440 100644 --- a/intern/opencolorio/SConscript +++ b/intern/opencolorio/SConscript @@ -8,12 +8,12 @@ incs = '. ../guardedalloc ../../source/blender/blenlib' defs = [] if env['WITH_BF_OCIO']: - incs += ' ' + env['BF_OCIO_INC'] defs.append('WITH_OCIO') + incs += ' ' + env['BF_OCIO_INC'] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): incs += ' ' + env['BF_BOOST_INC'] else: - sources.remove('ocio_capi.cc') + sources.remove('ocio_impl.cc') env.BlenderLib( 'bf_intern_opencolorio', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) |