diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
| commit | d8e2ed8ae2257c9e301dd85127cab5d6cc2b6a58 (patch) | |
| tree | b8402f51476ad78d175411f2ef733816dd7a4fcd /intern/opencolorio/SConscript | |
| parent | 5323a2f18f0e004a2e2cf6d619a6f93456c47f03 (diff) | |
| parent | db5682ac8c53377e819fd50357de580c02405fca (diff) | |
svn merge ^/trunk/blender -r50999:51100soc-2012-bratwurst
Diffstat (limited to 'intern/opencolorio/SConscript')
| -rw-r--r-- | intern/opencolorio/SConscript | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/opencolorio/SConscript b/intern/opencolorio/SConscript index fec07662735..a4d21f3e440 100644 --- a/intern/opencolorio/SConscript +++ b/intern/opencolorio/SConscript @@ -2,18 +2,18 @@ Import('env') -sources = env.Glob('*.cpp') +sources = env.Glob('*.cc') incs = '. ../guardedalloc ../../source/blender/blenlib' +defs = [] if env['WITH_BF_OCIO']: - sources.remove('ocio_capi_stub.cpp') - + 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.cpp') + sources.remove('ocio_impl.cc') -env.BlenderLib( 'bf_intern_opencolorio', sources, Split(incs), [], libtype=['extern','player'], priority=[10, 185]) +env.BlenderLib( 'bf_intern_opencolorio', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) |