Commit 7f293cc7d8a79e7fbe6ec2f6f28bf0b1407229e1

Build updates for OS X.

macports ships boost regex as boost_regex-mt
SConstruct
(17 / 10)
  
1111env.Append(LIBPATH = ['/opt/local/lib', '/usr/local/lib'])
1212
1313if ARGUMENTS.get('USE_ASSERT', 0):
14 env.Append(CCFLAGS = '-DUSE_ASSERT=1')
14 env.Append(CCFLAGS = '-DUSE_ASSERT=1')
1515
1616env.Append(CCFLAGS = '-g -Wall -Werror')
1717env.Append(LINKFLAGS = '-g')
1818
1919if ARGUMENTS.get('PROFILE', 0):
20 env.Append(CCFLAGS = '-pg')
21 env.Append(LINKFLAGS = '-pg')
20 env.Append(CCFLAGS = '-pg')
21 env.Append(LINKFLAGS = '-pg')
2222else:
23 # Turn on tons of optimization if we're not profiling.
24 env.Append(CCFLAGS = '-O3')
23 # Turn on tons of optimization if we're not profiling.
24 env.Append(CCFLAGS = '-O3')
2525
2626env.conf = Configure(env)
2727
28build_libs=['z']
29
2830if not env.conf.CheckLibWithHeader('boost_regex',
29 'boost/regex.hpp', 'c++'):
30 print 'Boost regex is required'
31 Exit(1)
31 'boost/regex.hpp', 'c++'):
32 if not env.conf.CheckLibWithHeader('boost_regex-mt',
33 'boost/regex.hpp', 'c++'):
34 print 'Boost regex is required'
35 Exit(1)
36 else:
37 build_libs.append('boost_regex-mt')
38else:
39 build_libs.append('boost_regex')
3240
3341env = env.conf.Finish()
34env.Program('logmerge', ['logmerge.cpp', 'logfiles.cpp'],
35 LIBS=['z', 'boost_regex'])
42env.Program('logmerge', ['logmerge.cpp', 'logfiles.cpp'], LIBS=build_libs)
3643
3744# vim: syntax=python