Commit: 556c4ae27fa77bee2d86223a48e2494ab3e21ecf
Author: Martin Felke
Date: Sun Oct 5 20:35:59 2014 +0200
Branches: fracture_modifier
https://developer.blender.org/rB556c4ae27fa77bee2d86223a48e2494ab3e21ecf
scons compiling fixes
===================================================================
M extern/voro++/SConscript
M source/blender/blenkernel/SConscript
M source/blender/modifiers/SConscript
===================================================================
diff --git a/extern/voro++/SConscript b/extern/voro++/SConscript
index df7ea98..74f8e16 100644
--- a/extern/voro++/SConscript
+++ b/extern/voro++/SConscript
@@ -4,9 +4,9 @@ import os
Import ('env')
sources = env.Glob('src/*.cc')
+sources.remove('src'+os.sep+'voro++.cc')
sources.remove('src'+os.sep+'v_base_wl.cc')
defs = []
incs = ['src']
-
env.BlenderLib ('extern_voro++', Split(sources), incs, defs,
libtype=['extern'], priority=[40] )
diff --git a/source/blender/blenkernel/SConscript
b/source/blender/blenkernel/SConscript
index 25f8422..94e42fa 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -167,6 +167,10 @@ if env['WITH_BF_INTERNATIONAL']:
if env['WITH_BF_FREESTYLE']:
defs.append('WITH_FREESTYLE')
+if env['WITH_BF_VORONOI']:
+ incs += ' #/extern/voro++'
+ defs.append('WITH_VORO')
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc',
'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
diff --git a/source/blender/modifiers/SConscript
b/source/blender/modifiers/SConscript
index 1ca7dd1..49baa6a 100644
--- a/source/blender/modifiers/SConscript
+++ b/source/blender/modifiers/SConscript
@@ -66,7 +66,7 @@ if env['WITH_BF_OCEANSIM']:
if env['WITH_BF_VORONOI']:
incs += ' #/extern/voro++'
- defs.append('WITH_MOD_VORONOI')
+ defs.append('WITH_VORO')
if env['WITH_BF_BULLET']:
defs.append('WITH_BULLET')
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
