Swiftdiff options
Diffstat (limited to '3rdParty/Expat/SConscript')
| -rw-r--r-- | 3rdParty/Expat/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript index d5724b4..e8c1e25 100644 --- a/3rdParty/Expat/SConscript +++ b/3rdParty/Expat/SConscript @@ -5,19 +5,22 @@ if env.get("EXPAT_BUNDLED", False) : env["EXPAT_FLAGS"] = { "CPPDEFINES": ["XML_STATIC"], "CPPPATH": [Dir("src")], "LIBPATH": [Dir(".")], } if env["SCONS_STAGE"] == "build" : myenv = env.Clone() myenv.Append(CPPDEFINES = ["XML_STATIC", "HAVE_EXPAT_CONFIG_H"]) - myenv.Append(CPPPATH = [".", "src"]) + if env.get("BOOST_BUNDLED", False) : + myenv.Append(CPPPATH = [".", "src", "../Boost/src"]) + else : + myenv.Append(CPPPATH = [".", "src"]) conf = Configure(conf_env) if conf.CheckFunc('memmove') : myenv.Append(CPPDEFINES = ["HAVE_MEMMOVE"]) conf.Finish() env["EXPAT_OBJECTS"] = myenv.SwiftenObject([ "src/xmltok.c", "src/xmlparse.c", |