Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-09-24 18:59:52 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-10-30 14:13:39 (GMT) |
| commit | 3d62970e1b929cf676202fc6cebc1cf426c14ff2 (patch) | |
| tree | a68c82c3829a001c6f8cadbb2d68d91c98f617bf /3rdParty/LibIDN/SConscript | |
| parent | 3cc7e86420e4b3d67c5882d8d68e1e6a003c6154 (diff) | |
| download | swift-3d62970e1b929cf676202fc6cebc1cf426c14ff2.zip swift-3d62970e1b929cf676202fc6cebc1cf426c14ff2.tar.bz2 | |
Update libIDN in 3rdParty to version 1.32
Updated existing libIDN files in 3rdParty folder to latest
1.32 version and added remaining dependencies for compilation.
Updated SConscript file accordingly.
Test-Information:
Build and ran test=unit on OS X 10.10.
Change-Id: Iec6506e1cc88fe2983b2019aca95a42580d1c80e
Diffstat (limited to '3rdParty/LibIDN/SConscript')
| -rw-r--r-- | 3rdParty/LibIDN/SConscript | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript index 3711ad8..cfe189b 100644 --- a/3rdParty/LibIDN/SConscript +++ b/3rdParty/LibIDN/SConscript @@ -10,7 +10,7 @@ if env.get("LIBIDN_BUNDLED", False) : if env["SCONS_STAGE"] == "flags" : env["LIBIDN_FLAGS"] = { - "CPPDEFINES": ["IDNA_STATIC"], + "CPPDEFINES": ["LIBIDN_STATIC"], } if os.path.basename(env["CC"]) in ("clang", "gcc") : env["LIBIDN_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibIDN/src"]}) @@ -48,8 +48,8 @@ if env.get("LIBIDN_BUNDLED", False) : Exit(1) conf.Finish() - myenv.Append(CPPDEFINES = "IDNA_STATIC") - myenv.Append(CPPPATH = ["src", "stubs"]) + myenv.Append(CPPDEFINES = ["LIBIDN_STATIC", "HAVE_CONFIG_H"]) + myenv.Append(CPPPATH = ["src", "stubs", "src/gl"]) if myenv["PLATFORM"] == "win32" : myenv.Append(CPPPATH = "stubs/win32") if myenv["MSVC_VERSION"][:3] == "9.0" : @@ -62,5 +62,9 @@ if env.get("LIBIDN_BUNDLED", False) : "src/punycode.c", "src/idna.c", "src/toutf8.c", - "src/nfkc.c" + "src/nfkc.c", + "src/gl/c-ctype.c", + "src/gl/c-strcasecmp.c", + "src/gl/c-strncasecmp.c", + "src/gl/unistr/u8-check.c" ]) |