summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--3rdParty/Expat/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index e8c1e25..c961483 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -12,12 +12,13 @@ if env.get("EXPAT_BUNDLED", False) :
myenv = env.Clone()
myenv.Append(CPPDEFINES = ["XML_STATIC", "HAVE_EXPAT_CONFIG_H"])
if env.get("BOOST_BUNDLED", False) :
myenv.Append(CPPPATH = [".", "src", "../Boost/src"])
else :
myenv.Append(CPPPATH = [".", "src"])
+ myenv.MergeFlags(env["BOOST_FLAGS"])
conf = Configure(conf_env)
if conf.CheckFunc('memmove') :
myenv.Append(CPPDEFINES = ["HAVE_MEMMOVE"])
conf.Finish()