summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-09 19:00:55 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-09 19:19:59 (GMT)
commit644051bad4ce7b088ea8af07c9b82a5920c96f4b (patch)
tree5c18f3cee950a7e9a683e6cbb666ec0ea128ee0e /3rdParty/Boost
parentb3b77f1d4a85a9a933b1a913a90b57a0e2db42a3 (diff)
downloadswift-contrib-644051bad4ce7b088ea8af07c9b82a5920c96f4b.zip
swift-contrib-644051bad4ce7b088ea8af07c9b82a5920c96f4b.tar.bz2
Enabled & fixed some more C++ warnings.
Diffstat (limited to '3rdParty/Boost')
-rw-r--r--3rdParty/Boost/SConscript11
1 files changed, 8 insertions, 3 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 49e66e5..9181425 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -16,6 +16,11 @@ elif env.get("BOOST_BUNDLED", False) :
################################################################################
cppdefines = ["BOOST_ALL_NO_LIB"]
+ if env["PLATFORM"] == "win32" :
+ cppflags = ["/I" + Dir("src").abspath]
+ else :
+ cppflags = [("-isystem", Dir("src").abspath)]
+
################################################################################
# Flags
@@ -23,7 +28,7 @@ elif env.get("BOOST_BUNDLED", False) :
if env["SCONS_STAGE"] == "flags" :
env["BOOST_FLAGS"] = {
- "CPPFLAGS": ["-I" + Dir("src").abspath],
+ "CPPFLAGS": cppflags,
"CPPDEFINES": cppdefines,
"LIBPATH": [Dir(".")],
"LIBS": ["Boost"]
@@ -41,7 +46,7 @@ elif env.get("BOOST_BUNDLED", False) :
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
- myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
+ myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")])
sources = [
"src/libs/date_time/src/gregorian/date_generators.cpp",
@@ -100,7 +105,7 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/thread/src/win32/tss_dll.cpp",
"src/libs/thread/src/win32/tss_pe.cpp"]
- myenv.StaticLibrary("Boost", sources, CPPFLAGS = "-I" + Dir("src").abspath, CPPDEFINES = cppdefines)
+ myenv.StaticLibrary("Boost", sources, CPPFLAGS = cppflags, CPPDEFINES = cppdefines)
if ARGUMENTS.get("BOOST_BUILD_BCP") or env.GetOption("clean") :
bcp_env = myenv.Clone()