Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-11-12 13:42:58 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-12-17 20:06:10 (GMT) |
| commit | 02a5b5c7f263913bd3d9b6977a1c6935e90c97eb (patch) | |
| tree | c5f3078540ae663d2a7cd379660f2fb8847efb06 /3rdParty/LibIDN/SConscript | |
| parent | 6c63910aa1016f06113fd562c8ffebfa6b4241b2 (diff) | |
| download | swift-02a5b5c7f263913bd3d9b6977a1c6935e90c97eb.zip swift-02a5b5c7f263913bd3d9b6977a1c6935e90c97eb.tar.bz2 | |
3rdParty fixes to enable compatibility with VS 2015
Included patches for future reference.
Test-Information:
Tested patches with VS 2015 Community and unit tests for
32 bit and 64 bit builds.
Change-Id: Ifa8d0ca3bf33010af8d8094c6df45f2a5702976c
Diffstat (limited to '3rdParty/LibIDN/SConscript')
| -rw-r--r-- | 3rdParty/LibIDN/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript index cfe189b..e3ed839 100644 --- a/3rdParty/LibIDN/SConscript +++ b/3rdParty/LibIDN/SConscript @@ -19,6 +19,8 @@ if env.get("LIBIDN_BUNDLED", False) : if env["PLATFORM"] == "win32" : env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")] + if float(env["MSVC_VERSION"]) < 14: + env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/stdbool")] if env["MSVC_VERSION"][:3] == "9.0" : env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/VC2008")] @@ -52,6 +54,8 @@ if env.get("LIBIDN_BUNDLED", False) : myenv.Append(CPPPATH = ["src", "stubs", "src/gl"]) if myenv["PLATFORM"] == "win32" : myenv.Append(CPPPATH = "stubs/win32") + if float(env["MSVC_VERSION"]) < 14: + myenv.Append(CPPPATH = "stubs/win32/stdbool") if myenv["MSVC_VERSION"][:3] == "9.0" : myenv.Append(CPPPATH = "stubs/win32/VC2008") |