diff options
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] ) |