summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--3rdParty/Boost/SConscript4
-rw-r--r--3rdParty/Boost/src/libs/filesystem/v3/src/filesystem_utf8_codecvt_facet.cpp (renamed from 3rdParty/Boost/src/libs/filesystem/v3/src/utf8_codecvt_facet.cpp)0
-rw-r--r--3rdParty/Boost/src/libs/program_options/src/program_options_utf8_codecvt_facet.cpp (renamed from 3rdParty/Boost/src/libs/program_options/src/utf8_codecvt_facet.cpp)0
-rwxr-xr-x3rdParty/Boost/update.sh3
4 files changed, 5 insertions, 2 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index b861b4a..d889fe8 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -64,7 +64,7 @@ elif env.get("BOOST_BUNDLED", False) :
"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/utf8_codecvt_facet.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",
"src/libs/regex/src/cregex.cpp",
@@ -89,7 +89,7 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/program_options/src/parsers.cpp",
"src/libs/program_options/src/positional_options.cpp",
"src/libs/program_options/src/split.cpp",
- "src/libs/program_options/src/utf8_codecvt_facet.cpp",
+ "src/libs/program_options/src/program_options_utf8_codecvt_facet.cpp",
"src/libs/program_options/src/value_semantic.cpp",
"src/libs/program_options/src/variables_map.cpp",
"src/libs/program_options/src/winmain.cpp"]
diff --git a/3rdParty/Boost/src/libs/filesystem/v3/src/utf8_codecvt_facet.cpp b/3rdParty/Boost/src/libs/filesystem/v3/src/filesystem_utf8_codecvt_facet.cpp
index 1849a1a..1849a1a 100644
--- a/3rdParty/Boost/src/libs/filesystem/v3/src/utf8_codecvt_facet.cpp
+++ b/3rdParty/Boost/src/libs/filesystem/v3/src/filesystem_utf8_codecvt_facet.cpp
diff --git a/3rdParty/Boost/src/libs/program_options/src/utf8_codecvt_facet.cpp b/3rdParty/Boost/src/libs/program_options/src/program_options_utf8_codecvt_facet.cpp
index c0fd7c0..c0fd7c0 100644
--- a/3rdParty/Boost/src/libs/program_options/src/utf8_codecvt_facet.cpp
+++ b/3rdParty/Boost/src/libs/program_options/src/program_options_utf8_codecvt_facet.cpp
diff --git a/3rdParty/Boost/update.sh b/3rdParty/Boost/update.sh
index f653e6d..49d55ba 100755
--- a/3rdParty/Boost/update.sh
+++ b/3rdParty/Boost/update.sh
@@ -42,6 +42,9 @@ done
rm -rf $TARGET_DIR/tools/bcp/*.html $TARGET_DIR/libs/test $TARGET_DIR/doc $TARGET_DIR/boost.png $TARGET_DIR/boost/test $TARGET_DIR/tools/bcp/Jamfile.v2 $TARGET_DIR/tools/bcp/doc $TARGET_DIR/tools/bcp/test $TARGET_DIR/Jamroot
rm -rf $TARGET_DIR/libs/filesystem/v2/build $TARGET_DIR/libs/filesystem/v3/build
+mv $TARGET_DIR/libs/filesystem/v3/src/utf8_codecvt_facet.cpp $TARGET_DIR/libs/filesystem/v3/src/filesystem_utf8_codecvt_facet.cpp
+mv $TARGET_DIR/libs/program_options/src/utf8_codecvt_facet.cpp $TARGET_DIR/libs/program_options/src/program_options_utf8_codecvt_facet.cpp
+
for diff in *.diff; do
patch -p3 < $diff
done