forked from bartvdbraak/blender
7a85ad51bf
Error was caused by boost library (which doesn't seem to be working with Cycles too when compiling with mingw). Switched mingw to use TR1 unordered collections. Also, there was re-declaration of strcasecmp when mingw is used. Additional changes are related on using own process spawning when BF_TOOLSET is set to mingw. Seems to be working fine now (i've got too long command line error) and no warning are supressing now (as it was told in comment for commented own process spawning).
31 lines
1.1 KiB
Python
31 lines
1.1 KiB
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
incs = '. intern extern ../moto/include ../container ../memutil'
|
|
incs += ' ../../source/blender/makesdna ../../intern/guardedalloc'
|
|
incs += ' ../../source/blender/blenlib'
|
|
|
|
defs = []
|
|
|
|
if not env['WITH_BF_CARVE']:
|
|
sources = env.Glob('intern/*.cpp')
|
|
sources.remove('intern' + os.sep + 'BOP_CarveInterface.cpp')
|
|
else:
|
|
sources = env.Glob('intern/BOP_CarveInterface.cpp')
|
|
incs += ' ../../extern/carve/include'
|
|
|
|
if env['WITH_BF_BOOST']:
|
|
if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
|
|
# Boost is setting as preferred collections library in the Carve code when using MSVC compiler
|
|
if env['OURPLATFORM'] != 'win32-mingw':
|
|
defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
|
|
|
|
defs.append('CARVE_SYSTEM_BOOST')
|
|
incs += ' ' + env['BF_BOOST_INC']
|
|
|
|
if (env['OURPLATFORM'] == 'win32-mingw'):
|
|
env.BlenderLib ('bf_intern_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
|
|
else:
|
|
env.BlenderLib ('bf_intern_bop', sources, Split(incs) , defs, libtype='intern', priority = 5 )
|
|
|