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 @@ -34,19 +34,19 @@ elif env.get("BOOST_BUNDLED", False) : 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() diff --git a/Swiften/SConscript b/Swiften/SConscript index a37767c..29298ca 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -70,18 +70,21 @@ if env["SCONS_STAGE"] == "flags" : "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", {})) |