Revision: 41686
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41686
Author: gsrb3d
Date: 2011-11-08 21:24:32 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
trunk/blender/intern/cycles/SConscript
Property Changed:
----------------
trunk/blender/intern/cycles/SConscript
Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript 2011-11-08 21:17:42 UTC (rev
41685)
+++ trunk/blender/intern/cycles/SConscript 2011-11-08 21:24:32 UTC (rev
41686)
@@ -1,33 +1,33 @@
-#!/usr/bin/python
-from os import path
-Import('env')
-
-cycles = env.Clone()
-
-cycles.Depends('../../source/blender/makesrna/intern/RNA_blender_cpp.h',
'makesrna')
-
-sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') +
cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') +
cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('util/*.c')
+ cycles.Glob('blender/*.cpp')
-
-sources.remove(path.join('util', 'util_view.cpp'))
-sources.remove(path.join('render', 'film_response.cpp'))
-
-incs = []
-defs = []
-
-defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
-defs.append('CCL_NAMESPACE_END=}')
-
-defs.append('WITH_OPENCL')
-defs.append('WITH_MULTI')
-defs.append('WITH_CUDA')
-
-incs.extend('. bvh render device kernel kernel/osl kernel/svm util
subd'.split())
-incs.extend('#intern/guardedalloc #source/blender/makesrna
#source/blender/makesdna'.split())
-incs.extend('#source/blender/blenloader
../../source/blender/makesrna/intern'.split())
-incs.extend('#extern/glew/include'.split())
-incs.append(cycles['BF_OIIO_INC'])
-incs.append(cycles['BF_BOOST_INC'])
-incs.append(cycles['BF_PYTHON_INC'])
-
-cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'],
priority=[0] )
-
+#!/usr/bin/python
+from os import path
+Import('env')
+
+cycles = env.Clone()
+
+cycles.Depends('../../source/blender/makesrna/intern/RNA_blender_cpp.h',
'makesrna')
+
+sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') +
cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') +
cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('util/*.c')
+ cycles.Glob('blender/*.cpp')
+
+sources.remove(path.join('util', 'util_view.cpp'))
+sources.remove(path.join('render', 'film_response.cpp'))
+
+incs = []
+defs = []
+
+defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
+defs.append('CCL_NAMESPACE_END=}')
+
+defs.append('WITH_OPENCL')
+defs.append('WITH_MULTI')
+defs.append('WITH_CUDA')
+
+incs.extend('. bvh render device kernel kernel/osl kernel/svm util
subd'.split())
+incs.extend('#intern/guardedalloc #source/blender/makesrna
#source/blender/makesdna'.split())
+incs.extend('#source/blender/blenloader
../../source/blender/makesrna/intern'.split())
+incs.extend('#extern/glew/include'.split())
+incs.append(cycles['BF_OIIO_INC'])
+incs.append(cycles['BF_BOOST_INC'])
+incs.append(cycles['BF_PYTHON_INC'])
+
+cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'],
priority=[0] )
+
Property changes on: trunk/blender/intern/cycles/SConscript
___________________________________________________________________
Added: svn:eol-style
+ native
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
