Swiftdiff options
Diffstat (limited to '3rdParty/Expat/SConscript')
| -rw-r--r-- | 3rdParty/Expat/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript index 2898be4..e8c1e25 100644 --- a/3rdParty/Expat/SConscript +++ b/3rdParty/Expat/SConscript @@ -7,5 +7,4 @@ if env.get("EXPAT_BUNDLED", False) : "CPPPATH": [Dir("src")], "LIBPATH": [Dir(".")], - "LIBS": ["Swiften_Expat"], } @@ -13,4 +12,7 @@ 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"]) @@ -20,5 +22,5 @@ if env.get("EXPAT_BUNDLED", False) : conf.Finish() - myenv.StaticLibrary("Swiften_Expat", [ + env["EXPAT_OBJECTS"] = myenv.SwiftenObject([ "src/xmltok.c", "src/xmlparse.c", |