summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Expat')
-rw-r--r--3rdParty/Expat/SConscript3
-rw-r--r--3rdParty/Expat/expat_config.h2
2 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
@@ -12,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"])
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
@@ -2,4 +2,4 @@
#define XML_NS 1
-#include "../Boost/src/boost/detail/endian.hpp"
+#include <boost/detail/endian.hpp>
#define BYTEORDER BOOST_BYTE_ORDER