[Bf-blender-cvs] [9185ab5] master: Fix scons compiling after carve changes
Jens Verwiebe
noreply at git.blender.org
Thu Feb 13 23:21:27 CET 2014
Commit: 9185ab5d9c5c0b13eb90f6da9e5f81e36ae4f0fc
Author: Jens Verwiebe
Date: Thu Feb 13 23:21:13 2014 +0100
https://developer.blender.org/rB9185ab5d9c5c0b13eb90f6da9e5f81e36ae4f0fc
Fix scons compiling after carve changes
===================================================================
M extern/carve/SConscript
M source/blender/modifiers/SConscript
===================================================================
diff --git a/extern/carve/SConscript b/extern/carve/SConscript
index 1ba67e5..f975e25 100644
--- a/extern/carve/SConscript
+++ b/extern/carve/SConscript
@@ -7,6 +7,7 @@
Import ('env')
sources = env.Glob('lib/*.cpp')
+sources += env.Glob('*.cc')
defs = []
incs = ['include']
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript
index a0dfb27..0942bca 100644
--- a/source/blender/modifiers/SConscript
+++ b/source/blender/modifiers/SConscript
@@ -50,7 +50,7 @@ incs = [
defs = []
-if env ['WITH_BF_BOOLEAN']:
+if env['WITH_BF_BOOLEAN']:
incs.append('#/extern/carve')
defs.append('WITH_MOD_BOOLEAN')
More information about the Bf-blender-cvs
mailing list