Swift
summaryrefslogtreecommitdiffstats
path: root/3rdParty/Boost/SConscript
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/SConscript')
-rw-r--r--3rdParty/Boost/SConscript68
1 files changed, 53 insertions, 15 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 714b90b..200c2b4 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -20,5 +20,5 @@ elif env.get("BOOST_BUNDLED", False) :
################################################################################
- 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"]
@@ -41,5 +41,5 @@ elif env.get("BOOST_BUNDLED", False) :
}
if env["PLATFORM"] == "win32" :
- env["BOOST_FLAGS"]["CPPDEFINES"] += [("_WIN32_WINNT", "0x0501")]
+ env["BOOST_FLAGS"]["CPPDEFINES"] += [("_WIN32_WINNT", "_WIN32_WINNT_VISTA")]
if env["PLATFORM"] == "cygwin" :
env["BOOST_FLAGS"]["CPPDEFINES"] += ["__USE_W32_SOCKETS"]
@@ -54,4 +54,5 @@ elif env.get("BOOST_BUNDLED", False) :
sources = [
+ "src/libs/atomic/src/lockpool.cpp",
"src/libs/date_time/src/gregorian/date_generators.cpp",
"src/libs/date_time/src/gregorian/greg_month.cpp",
@@ -66,8 +67,12 @@ elif env.get("BOOST_BUNDLED", False) :
"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/filesystem_utf8_codecvt_facet.cpp",
+ "src/libs/filesystem/src/codecvt_error_category.cpp",
+ "src/libs/filesystem/src/operations.cpp",
+ "src/libs/filesystem/src/path.cpp",
+ "src/libs/filesystem/src/path_traits.cpp",
+ "src/libs/filesystem/src/portability.cpp",
+ "src/libs/filesystem/src/unique_path.cpp",
+ "src/libs/filesystem/src/windows_file_codecvt.cpp",
+ "src/libs/filesystem/src/filesystem_utf8_codecvt_facet.cpp",
"src/libs/regex/src/c_regex_traits.cpp",
"src/libs/regex/src/cpp_regex_traits.cpp",
@@ -96,5 +101,43 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/program_options/src/value_semantic.cpp",
"src/libs/program_options/src/variables_map.cpp",
- "src/libs/program_options/src/winmain.cpp"]
+ "src/libs/program_options/src/winmain.cpp",
+ "src/libs/serialization/src/archive_exception.cpp",
+ "src/libs/serialization/src/basic_archive.cpp",
+ "src/libs/serialization/src/basic_iarchive.cpp",
+ "src/libs/serialization/src/basic_iserializer.cpp",
+ "src/libs/serialization/src/basic_oarchive.cpp",
+ "src/libs/serialization/src/basic_oserializer.cpp",
+ "src/libs/serialization/src/basic_pointer_iserializer.cpp",
+ "src/libs/serialization/src/basic_pointer_oserializer.cpp",
+ "src/libs/serialization/src/basic_serializer_map.cpp",
+ "src/libs/serialization/src/basic_text_iprimitive.cpp",
+ "src/libs/serialization/src/basic_text_oprimitive.cpp",
+ "src/libs/serialization/src/basic_text_wiprimitive.cpp",
+ "src/libs/serialization/src/basic_text_woprimitive.cpp",
+ "src/libs/serialization/src/basic_xml_archive.cpp",
+ "src/libs/serialization/src/binary_iarchive.cpp",
+ "src/libs/serialization/src/binary_oarchive.cpp",
+ "src/libs/serialization/src/binary_wiarchive.cpp",
+ "src/libs/serialization/src/binary_woarchive.cpp",
+ "src/libs/serialization/src/codecvt_null.cpp",
+ "src/libs/serialization/src/extended_type_info.cpp",
+ "src/libs/serialization/src/extended_type_info_no_rtti.cpp",
+ "src/libs/serialization/src/extended_type_info_typeid.cpp",
+ "src/libs/serialization/src/polymorphic_iarchive.cpp",
+ "src/libs/serialization/src/polymorphic_oarchive.cpp",
+ "src/libs/serialization/src/stl_port.cpp",
+ "src/libs/serialization/src/text_iarchive.cpp",
+ "src/libs/serialization/src/text_oarchive.cpp",
+ "src/libs/serialization/src/text_wiarchive.cpp",
+ "src/libs/serialization/src/text_woarchive.cpp",
+ "src/libs/serialization/src/utf8_codecvt_facet.cpp",
+ "src/libs/serialization/src/void_cast.cpp",
+ "src/libs/serialization/src/xml_archive_exception.cpp",
+ "src/libs/serialization/src/xml_grammar.cpp",
+ "src/libs/serialization/src/xml_iarchive.cpp",
+ "src/libs/serialization/src/xml_oarchive.cpp",
+ "src/libs/serialization/src/xml_wgrammar.cpp",
+ "src/libs/serialization/src/xml_wiarchive.cpp",
+ "src/libs/serialization/src/xml_woarchive.cpp"]
if env["PLATFORM"] != "darwin" or env["target"] == "native" :
@@ -106,4 +149,5 @@ elif env.get("BOOST_BUNDLED", False) :
sources += [
"src/libs/thread/src/pthread/once.cpp",
+ "src/libs/thread/src/pthread/once_atomic.cpp",
"src/libs/thread/src/pthread/thread.cpp"]
else :
@@ -117,17 +161,11 @@ elif env.get("BOOST_BUNDLED", False) :
myenv.StaticLibrary("Swiften_Boost", sources)
- if ARGUMENTS.get("BOOST_BUILD_BCP") or env.GetOption("clean") :
+ if ARGUMENTS.get("BOOST_BUILD_BCP") or env.get("BOOST_BUILD_BCP", False) or env.GetOption("clean") :
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.UseFlags(bcp_env["PLATFORM_FLAGS"])
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",