- Use the multithreaded versions of boost libs by default.
This commit is contained in:
parent
50e612417b
commit
0b86373457
1 changed files with 6 additions and 4 deletions
10
SConstruct
10
SConstruct
|
@ -107,7 +107,7 @@ if env['BIDI'] : C_LIBSHEADERS.append(['fribidi','fribidi/fribidi.h',True])
|
||||||
|
|
||||||
BOOST_LIBSHEADERS = [
|
BOOST_LIBSHEADERS = [
|
||||||
['thread', 'boost/thread/mutex.hpp', True],
|
['thread', 'boost/thread/mutex.hpp', True],
|
||||||
#['system', 'boost/system/system_error.hpp', True],
|
# ['system', 'boost/system/system_error.hpp', True],
|
||||||
['filesystem', 'boost/filesystem/operations.hpp', True],
|
['filesystem', 'boost/filesystem/operations.hpp', True],
|
||||||
['regex', 'boost/regex.hpp', True],
|
['regex', 'boost/regex.hpp', True],
|
||||||
['program_options', 'boost/program_options.hpp', False]
|
['program_options', 'boost/program_options.hpp', False]
|
||||||
|
@ -124,12 +124,14 @@ if len(env['BOOST_TOOLKIT']): toolkit = env['BOOST_TOOLKIT']
|
||||||
else: toolkit = env['CC']
|
else: toolkit = env['CC']
|
||||||
|
|
||||||
for count, libinfo in enumerate(BOOST_LIBSHEADERS):
|
for count, libinfo in enumerate(BOOST_LIBSHEADERS):
|
||||||
if not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++'):
|
if not conf.CheckLibWithHeader('boost_%s-%s-mt' % (libinfo[0], toolkit), libinfo[1], 'C++'):
|
||||||
if not conf.CheckLibWithHeader('boost_%s-%s-mt' % (libinfo[0], toolkit), libinfo[1], 'C++') and libinfo[2] and count == 0:
|
if not conf.CheckLibWithHeader('boost_%s-%s' % (libinfo[0], toolkit), libinfo[1], 'C++') and libinfo[2] and count == 0:
|
||||||
print 'Could not find header or shared library for boost %s, exiting!' % libinfo[0]
|
print 'Could not find header or shared library for boost %s, exiting!' % libinfo[0]
|
||||||
Exit(1)
|
Exit(1)
|
||||||
else:
|
else:
|
||||||
env['BOOST_APPEND'] = '-%s-mt' % toolkit
|
env['BOOST_APPEND'] = '-%s' % toolkit
|
||||||
|
else:
|
||||||
|
env['BOOST_APPEND'] = '-%s-mt' % toolkit
|
||||||
|
|
||||||
Export('env')
|
Export('env')
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue