env.Append(
LIBS = [ 'rt' ],
- CXXFLAGS = [ '-Wno-long-long', '$CXXFLAGS_' ],
+ CXXFLAGS = [ '-Wno-long-long', '$CXXFLAGS_', '-fno-strict-aliasing' ],
CXXFLAGS_ = BuildTypeOptions('CXXFLAGS'),
CPPDEFINES = [ '$expandLogOption', '$CPPDEFINES_' ],
CPPPATH = [ sconspath ],
BUNDLEDIR = sconspath,
SENFDIR = sconspath,
+ SENFINCDIR = sconspath,
SENFSYSLAYOUT = False)
try:
env.MergeFlags(file(os.path.join(path,"senf.conf")).read())
print "\nUsing system SENF in '%s/'\n" % sconspath
env.Append(BUNDLEDIR = os.path.join(sconspath,"lib/senf"),
SENFDIR = sconspath,
+ SENFINCDIR = '%s/include' % sconspath,
SENFSYSLAYOUT = True)
break
else:
# Only add senf after all configure checks have run
env.Append(
- CPPPATH = '${NEED_BOOST_EXT and "$SENFDIR/boost_ext" or None}',
+ CPPPATH = '${NEED_BOOST_EXT and "$SENFINCDIR/boost_ext" or None}',
LIBS = [ 'senf', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
'$BOOSTFSLIB' ],
)
def DefaultOptions(env):
env.Append(
CXXFLAGS = [ '-Wall', '-Woverloaded-virtual' ],
- CXXFLAGS_final = [ '-O2' ],
- CXXFLAGS_normal = [ '-O0', '-g' ],
- CXXFLAGS_debug = [ '$CXXFLAGS_normal' ],
+ CXXFLAGS_final = [ '-O3' ],
+ CXXFLAGS_normal = [ '-O2', '-g' ],
+ CXXFLAGS_debug = [ '-O0', '-g' ],
LINKFLAGS_normal = [ '-Wl,-S' ],
LINKFLAGS_debug = [ '-g' ],
def Configure(env):
- conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests())
+ conf = env.Configure(clean=False,
+ help=False,
+ custom_tests=senfconf.Tests(),
+ config_h="#/senf/autoconf.hh")
env.Replace(
BOOST_VERSION = conf.CheckBoostVersion(),
BOOST_VARIANT = conf.CheckBoostVariants( '', 'mt' ),
NEED_BOOST_EXT = not conf.CheckCXXHeader("boost/bimap.hpp"),
+ HAVE_BOOST_SPIRIT_INCLUDE_CLASSIC_HPP = conf.CheckCXXHeader(
+ "boost/spirit/include/classic.hpp"),
)
conf.Finish()