[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51060] trunk/blender/intern/opencolorio/ SConscript: * Fix Scons build when OCIO is disabled.
Thomas Dinges
blender at dingto.org
Fri Oct 5 01:44:05 CEST 2012
Revision: 51060
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51060
Author: dingto
Date: 2012-10-04 23:44:03 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
* Fix Scons build when OCIO is disabled.
Still fails when it's enabled though (unresolved symbols).
Modified Paths:
--------------
trunk/blender/intern/opencolorio/SConscript
Modified: trunk/blender/intern/opencolorio/SConscript
===================================================================
--- trunk/blender/intern/opencolorio/SConscript 2012-10-04 21:40:39 UTC (rev 51059)
+++ trunk/blender/intern/opencolorio/SConscript 2012-10-04 23:44:03 UTC (rev 51060)
@@ -8,12 +8,12 @@
defs = []
if env['WITH_BF_OCIO']:
+ defs.append('WITH_OCIO')
incs += ' ' + env['BF_OCIO_INC']
- defs.append('WITH_OCIO')
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])
More information about the Bf-blender-cvs
mailing list