Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-02-14 02:21:13 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-02-14 02:21:13 +0400
commit9185ab5d9c5c0b13eb90f6da9e5f81e36ae4f0fc (patch)
tree577270b28a9ff2c80d8e6ea1d59de60f15c33f1c
parent3f1a5902b9c575d18833d48006a1e0e08c881a2e (diff)
Fix scons compiling after carve changes
-rw-r--r--extern/carve/SConscript1
-rw-r--r--source/blender/modifiers/SConscript2
2 files changed, 2 insertions, 1 deletions
diff --git a/extern/carve/SConscript b/extern/carve/SConscript
index 1ba67e51327..f975e253d60 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 a0dfb27b85c..0942bca4ef3 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')