From 3eba19881894c17d2645f9e9723eae1be822e55a Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Thu, 4 Oct 2012 23:44:03 +0000 Subject: * Fix Scons build when OCIO is disabled. Still fails when it's enabled though (unresolved symbols). --- intern/opencolorio/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/opencolorio') 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]) -- cgit v1.2.3