Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-16 09:31:55 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-16 16:09:49 (GMT) |
| commit | c02aedbe59a3abc2a7b84b7e1a8bf3a7f11ee20f (patch) | |
| tree | 7d8702318423434e89cbf70bbbd563ba5d46eacd | |
| parent | 80a0e4117219a196f9f2c09e243713b26ead763f (diff) | |
| download | swift-contrib-c02aedbe59a3abc2a7b84b7e1a8bf3a7f11ee20f.zip swift-contrib-c02aedbe59a3abc2a7b84b7e1a8bf3a7f11ee20f.tar.bz2 | |
Specify minimal Windows API version for Windows builds.
This sets _WIN32_WINNT and NTDDI_VERSION defines. The minimal version required
is Windows Vista since smart card support requires this version.
Test-Information:
With these defines Swift/-en builds successfully on Windows 8.1 with VisualStudio
Express 2013 for Desktop.
Change-Id: I8745f201559cd9c401caef7661f09939dffae38f
| -rw-r--r-- | 3rdParty/Boost/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/SConscript | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index adb6d4e..a0d6500 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -8,71 +8,71 @@ if env.get("BOOST_BUNDLED_UUID_ONLY", False) : if env["PLATFORM"] == "win32" : uuid_cppflags = ["/I" + Dir("uuid").abspath] else : uuid_cppflags = [("-isystem", Dir("uuid").abspath)] env["BOOST_FLAGS"]["CPPFLAGS"] = env["BOOST_FLAGS"].get("CPPFLAGS", []) + uuid_cppflags elif env["SCONS_STAGE"] == "build" : env.Install("uuid/boost", "src/boost/uuid") elif env.get("BOOST_BUNDLED", False) : ################################################################################ # Common ################################################################################ cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED"] #if env["PLATFORM"] == "darwin" : # cppdefines += ["BOOST_ASIO_DISABLE_KQUEUE"] if env["PLATFORM"] == "win32" : cppflags = ["/I" + Dir("#/3rdParty/Boost/src").abspath] else : cppflags = [("-isystem", Dir("#/3rdParty/Boost/src").abspath)] ################################################################################ # Flags ################################################################################ if env["SCONS_STAGE"] == "flags" : env["BOOST_FLAGS"] = { "CPPFLAGS": cppflags, "CPPDEFINES": cppdefines, "LIBPATH": [Dir(".")], "LIBS": ["Swiften_Boost"] } 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"] ################################################################################ # Build ################################################################################ if env["SCONS_STAGE"] == "build" : myenv = env.Clone() myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")]) sources = [ "src/libs/date_time/src/gregorian/date_generators.cpp", "src/libs/date_time/src/gregorian/greg_month.cpp", "src/libs/date_time/src/gregorian/greg_weekday.cpp", "src/libs/date_time/src/gregorian/gregorian_types.cpp", "src/libs/date_time/src/posix_time/posix_time_types.cpp", "src/libs/system/src/error_code.cpp", "src/libs/thread/src/tss_null.cpp", "src/libs/signals/src/connection.cpp", "src/libs/signals/src/named_slot_map.cpp", "src/libs/signals/src/signal_base.cpp", "src/libs/signals/src/slot.cpp", "src/libs/signals/src/trackable.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", "src/libs/regex/src/cregex.cpp", diff --git a/Swiften/SConscript b/Swiften/SConscript index a37767c..29298ca 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -44,70 +44,73 @@ if env["SCONS_STAGE"] == "flags" : swiften_env["LIBPATH"] = [Dir(".")] swiften_env["LIBRUNPATH"] = [Dir(".")] swiften_env["LIBS"] = [swiften_env["SWIFTEN_LIBRARY"]] if not env["SWIFTEN_DLL"] : swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"]) dep_env = env.Clone() for module in swiften_dep_modules : module_flags = env.get(module + "_FLAGS", {}) if env.get(module + "_BUNDLED", False) : if module in external_swiften_dep_modules : swiften_env.UseFlags(module_flags) else : if module in external_swiften_dep_modules : dep_env.UseFlags(module_flags) else : # Expose only libraries dep_env.Append(LIBPATH = module_flags.get("LIBPATH", [])) dep_env.Append(LIBS = module_flags.get("LIBS", [])) dep_env.Append(FRAMEWORKS = module_flags.get("FRAMEWORKS", [])) dep_env.UseFlags(dep_env["PLATFORM_FLAGS"]) if env.get("HAVE_SCHANNEL", 0) : dep_env.Append(LIBS = ["Winscard"]) for var, e in [("SWIFTEN_FLAGS", swiften_env), ("SWIFTEN_DEP_FLAGS", dep_env)] : env[var] = { "CPPDEFINES": e.get("CPPDEFINES", []), "CPPPATH": e.get("CPPPATH", []), "CPPFLAGS": e.get("CPPFLAGS", []), "LIBPATH": e.get("LIBPATH", []), "LIBRUNPATH": e.get("LIBRUNPATH", []), "LIBS": e.get("LIBS", []), "FRAMEWORKS": e.get("FRAMEWORKS", []), } + if env["PLATFORM"] == "win32" : + env.Append(CPPDEFINES = [("_WIN32_WINNT","_WIN32_WINNT_VISTA") , ("NTDDI_VERSION","NTDDI_VISTA")]) + ################################################################################ # Build ################################################################################ if env["SCONS_STAGE"] == "build" : swiften_env = env.Clone() swiften_env.Append(CPPDEFINES = ["SWIFTEN_BUILDING"]) for module in swiften_dep_modules : swiften_env.UseFlags(swiften_env.get(module + "_FLAGS", {})) if env.get(module + "_BUNDLED", False) : swiften_env.Append(SWIFTEN_OBJECTS = env.get(module + "_OBJECTS", [])) swiften_env.UseFlags(swiften_env["PLATFORM_FLAGS"]) if swiften_env["SWIFTEN_DLL"] : swiften_env.AddMethod(lambda e,l,o : e.SharedLibrary(l,o), "SwiftenLibrary") else : swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"]) swiften_env.AddMethod(lambda e,l,o : e.StaticLibrary(l,o), "SwiftenLibrary") Export("swiften_env") # TODO: Move all this to a submodule SConscript sources = [ "Chat/ChatStateTracker.cpp", "Chat/ChatStateNotifier.cpp", "Client/ClientSessionStanzaChannel.cpp", "Client/CoreClient.cpp", "Client/Client.cpp", "Client/ClientXMLTracer.cpp", "Client/ClientSession.cpp", "Client/BlockList.cpp", "Client/BlockListImpl.cpp", "Client/ClientBlockListManager.cpp", "Client/MemoryStorages.cpp", "Client/NickResolver.cpp", "Client/NickManager.cpp", |