summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-07 09:41:43 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-07 09:41:43 (GMT)
commit56585257474fe4e9daf108d046177a6d36043cf7 (patch)
treecb7e57cb33dff91a4071166f20a060ae9227a475 /3rdParty/Boost
parentd631201597042e79ecef187ac7fd795cd7cc0cc0 (diff)
downloadswift-56585257474fe4e9daf108d046177a6d36043cf7.zip
swift-56585257474fe4e9daf108d046177a6d36043cf7.tar.bz2
Make Boost.BCP compile again.
Diffstat (limited to '3rdParty/Boost')
-rw-r--r--3rdParty/Boost/SConscript8
1 files changed, 8 insertions, 0 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index fc53b45..8d771ca 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -120,7 +120,15 @@ elif env.get("BOOST_BUNDLED", False) :
bcp_env = myenv.Clone()
bcp_env.MergeFlags(bcp_env["BOOST_FLAGS"])
bcp_env.Append(CPPPATH = ["src/tools/bcp"])
+ bcp_env.Replace(CPPDEFINES = [flag for flag in bcp_env["CPPDEFINES"] if flag[0] != "BOOST_FILESYSTEM_VERSION"])
bcp_env.Program("bcp", [
+ "src/libs/filesystem/v3/src/codecvt_error_category.cpp",
+ "src/libs/filesystem/v3/src/operations.cpp",
+ "src/libs/filesystem/v3/src/path.cpp",
+ "src/libs/filesystem/v3/src/path_traits.cpp",
+ "src/libs/filesystem/v3/src/portability.cpp",
+ "src/libs/filesystem/v3/src/unique_path.cpp",
+ "src/libs/filesystem/v3/src/windows_file_codecvt.cpp",
"src/tools/bcp/add_path.cpp",
"src/tools/bcp/add_dependent_lib.cpp",
"src/tools/bcp/bcp_imp.cpp",