summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-08-17 21:18:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-08-17 21:33:59 (GMT)
commit6856199274e9c5e581220fccf520b8f011519d17 (patch)
tree1929a1ea8f1d3b877fc8c928e9c3d23d9716ad82 /3rdParty/Boost/SConscript
parent4397df6b409ca84f63838fa635fc2abe8af80b71 (diff)
downloadswift-6856199274e9c5e581220fccf520b8f011519d17.zip
swift-6856199274e9c5e581220fccf520b8f011519d17.tar.bz2
Update to boost.filesystem v3.
Source should still compile against v2.
Diffstat (limited to '3rdParty/Boost/SConscript')
-rw-r--r--3rdParty/Boost/SConscript22
1 files changed, 11 insertions, 11 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 714b90b..f0d438b 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -19,7 +19,7 @@ elif env.get("BOOST_BUNDLED", False) :
# Common
################################################################################
- cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED", ("BOOST_FILESYSTEM_VERSION", "2")]
+ cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED"]
#if env["PLATFORM"] == "darwin" :
# cppdefines += ["BOOST_ASIO_DISABLE_KQUEUE"]
if env["PLATFORM"] == "win32" :
@@ -65,9 +65,16 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/signals/src/signal_base.cpp",
"src/libs/signals/src/slot.cpp",
"src/libs/signals/src/trackable.cpp",
- "src/libs/filesystem/v2/src/v2_operations.cpp",
- "src/libs/filesystem/v2/src/v2_path.cpp",
- "src/libs/filesystem/v2/src/v2_portability.cpp",
+ "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/libs/filesystem/v2/src/v2_operations.cpp",
+# "src/libs/filesystem/v2/src/v2_path.cpp",
+# "src/libs/filesystem/v2/src/v2_portability.cpp",
"src/libs/filesystem/v3/src/filesystem_utf8_codecvt_facet.cpp",
"src/libs/regex/src/c_regex_traits.cpp",
"src/libs/regex/src/cpp_regex_traits.cpp",
@@ -122,13 +129,6 @@ elif env.get("BOOST_BUNDLED", False) :
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",