diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-02 20:42:30 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-02 20:42:30 +0400 |
commit | 1a5998bc4ecaf23db4dbcf41d3872019944c74ac (patch) | |
tree | a9f3a2b0c6b9bc6c4622bb47867035b4b39bd8f3 /intern/bsp/SConscript | |
parent | ba5c635502b4eb7a96d9aae970117778c27243e6 (diff) |
Remove old boolean operation module
Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.
Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.
Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.
Diffstat (limited to 'intern/bsp/SConscript')
-rw-r--r-- | intern/bsp/SConscript | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index 4927c33dc8a..d3f7cf1c6ec 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -3,7 +3,21 @@ Import ('env') sources = env.Glob('intern/*.cpp') -incs = 'intern ../container ../moto/include ../memutil ../guardedalloc' +incs = 'intern ../container ../moto/include ../memutil ../guardedalloc ../../extern/carve/include' -env.BlenderLib ('bf_intern_bsp', sources, Split(incs), [], libtype=['core','player'], priority=[200,100] ) +defs = [] + +if env['WITH_BF_BOOST']: + isMINGW = env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw') + + if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc') and not isMINGW: + # Boost is setting as preferred collections library in the Carve code when using MSVC compiler + defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS') + + if not isMINGW: + defs.append('CARVE_SYSTEM_BOOST') + + incs += ' ' + env['BF_BOOST_INC'] + +env.BlenderLib ('bf_intern_bsp', sources, Split(incs), defs, libtype=['core','player'], priority=[200,100] ) |