Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2018-04-28 12:06:12 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2018-04-28 12:06:12 (GMT) |
| commit | 522dfe5cd1390181ec8fb3f5fa3c8f665af3f806 (patch) | |
| tree | 7ac3eac2a310c7ade0f9b8a17f2fa8710bbb6151 /Swiften/Config | |
| parent | 1b66a33c5fdacca2200e367c647b9a40768c569b (diff) | |
| download | swift-522dfe5cd1390181ec8fb3f5fa3c8f665af3f806.zip swift-522dfe5cd1390181ec8fb3f5fa3c8f665af3f806.tar.bz2 | |
Fix compiler warnings for Swiften
Test-Information:
./scons allow_warnings=0 Swiften now builds on latest macOS
Change-Id: Ic2095d5d112093d021f7f4695fbce73f315377cf
Diffstat (limited to 'Swiften/Config')
| -rw-r--r-- | Swiften/Config/SConscript | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript index dd06d61..ae0d37a 100644 --- a/Swiften/Config/SConscript +++ b/Swiften/Config/SConscript @@ -10,7 +10,7 @@ def cStringVariable(env, cVar, sconsVar) : # FIXME: Probably not very robust for var in sconsVar.split(" ") : result += "\t\"" + env.subst(var).replace("\\", "\\\\") + "\",\n" - result += "\t0\n" + result += "\tnullptr\n" result += "};\n" return result @@ -22,15 +22,15 @@ swiften_env.UseFlags(swiften_env["SWIFTEN_DEP_FLAGS"]) cppflags = replaceSwiftenPath(" ".join([ swiften_env.subst("$CPPFLAGS").replace("-isystem ","-I"), - swiften_env.subst("$_CPPDEFFLAGS"), + swiften_env.subst("$_CPPDEFFLAGS"), swiften_env.subst("$_CPPINCFLAGS")])) config_flags += cStringVariable(swiften_env, "CPPFLAGS", cppflags) libflags = replaceSwiftenPath(" ".join([ - swiften_env.subst("$_LIBDIRFLAGS"), - swiften_env.subst("$_LIBFLAGS"), - swiften_env.subst("$_FRAMEWORKPATH"), - swiften_env.subst("$_FRAMEWORKS"), + swiften_env.subst("$_LIBDIRFLAGS"), + swiften_env.subst("$_LIBFLAGS"), + swiften_env.subst("$_FRAMEWORKPATH"), + swiften_env.subst("$_FRAMEWORKS"), swiften_env.subst("$_FRAMEWORKSFLAGS") ])) config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags) |