summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/LibIDN/SConscript')
-rw-r--r--3rdParty/LibIDN/SConscript12
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
@@ -8,11 +8,11 @@ if env.get("LIBIDN_BUNDLED", False) :
8# Module flags 8# Module flags
9################################################################################ 9################################################################################
10 10
11 if env["SCONS_STAGE"] == "flags" : 11 if env["SCONS_STAGE"] == "flags" :
12 env["LIBIDN_FLAGS"] = { 12 env["LIBIDN_FLAGS"] = {
13 "CPPDEFINES": ["IDNA_STATIC"], 13 "CPPDEFINES": ["LIBIDN_STATIC"],
14 } 14 }
15 if os.path.basename(env["CC"]) in ("clang", "gcc") : 15 if os.path.basename(env["CC"]) in ("clang", "gcc") :
16 env["LIBIDN_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibIDN/src"]}) 16 env["LIBIDN_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibIDN/src"]})
17 else : 17 else :
18 env["LIBIDN_FLAGS"].update({"CPPPATH": [Dir("src")]}) 18 env["LIBIDN_FLAGS"].update({"CPPPATH": [Dir("src")]})
@@ -46,12 +46,12 @@ if env.get("LIBIDN_BUNDLED", False) :
46 else : 46 else :
47 print "Error: Cannot find strncasecmp() or strnicmp()" 47 print "Error: Cannot find strncasecmp() or strnicmp()"
48 Exit(1) 48 Exit(1)
49 conf.Finish() 49 conf.Finish()
50 50
51 myenv.Append(CPPDEFINES = "IDNA_STATIC") 51 myenv.Append(CPPDEFINES = ["LIBIDN_STATIC", "HAVE_CONFIG_H"])
52 myenv.Append(CPPPATH = ["src", "stubs"]) 52 myenv.Append(CPPPATH = ["src", "stubs", "src/gl"])
53 if myenv["PLATFORM"] == "win32" : 53 if myenv["PLATFORM"] == "win32" :
54 myenv.Append(CPPPATH = "stubs/win32") 54 myenv.Append(CPPPATH = "stubs/win32")
55 if myenv["MSVC_VERSION"][:3] == "9.0" : 55 if myenv["MSVC_VERSION"][:3] == "9.0" :
56 myenv.Append(CPPPATH = "stubs/win32/VC2008") 56 myenv.Append(CPPPATH = "stubs/win32/VC2008")
57 57
@@ -60,7 +60,11 @@ if env.get("LIBIDN_BUNDLED", False) :
60 "src/profiles.c", 60 "src/profiles.c",
61 "src/rfc3454.c", 61 "src/rfc3454.c",
62 "src/punycode.c", 62 "src/punycode.c",
63 "src/idna.c", 63 "src/idna.c",
64 "src/toutf8.c", 64 "src/toutf8.c",
65 "src/nfkc.c" 65 "src/nfkc.c",
66 "src/gl/c-ctype.c",
67 "src/gl/c-strcasecmp.c",
68 "src/gl/c-strncasecmp.c",
69 "src/gl/unistr/u8-check.c"
66 ]) 70 ])