Swiftdiff options
Diffstat (limited to '3rdParty/Expat')
| -rw-r--r-- | 3rdParty/Expat/SConscript | 5 | ||||
| -rw-r--r-- | 3rdParty/Expat/expat_config.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript index d5724b4..e8c1e25 100644 --- a/3rdParty/Expat/SConscript +++ b/3rdParty/Expat/SConscript @@ -11,7 +11,10 @@ if env.get("EXPAT_BUNDLED", False) : 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') : diff --git a/3rdParty/Expat/expat_config.h b/3rdParty/Expat/expat_config.h index fb87f9a..f102a51 100644 --- a/3rdParty/Expat/expat_config.h +++ b/3rdParty/Expat/expat_config.h @@ -1,5 +1,5 @@ #define XML_CONTEXT_BYTES 1024 #define XML_NS 1 -#include "../Boost/src/boost/detail/endian.hpp" +#include <boost/detail/endian.hpp> #define BYTEORDER BOOST_BYTE_ORDER |