Swiftdiff options
Diffstat (limited to '3rdParty')
| -rw-r--r-- | 3rdParty/Expat/SConscript | 2 | ||||
| -rw-r--r-- | 3rdParty/LibIDN/SConscript | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript index 2898be4..9e329f4 100644 --- a/3rdParty/Expat/SConscript +++ b/3rdParty/Expat/SConscript @@ -19,7 +19,7 @@ if env.get("EXPAT_BUNDLED", False) : myenv.Append(CPPDEFINES = ["HAVE_MEMMOVE"]) conf.Finish() - myenv.StaticLibrary("Swiften_Expat", [ + env["EXPAT_OBJECTS"] = myenv.StaticObject([ "src/xmltok.c", "src/xmlparse.c", "src/xmlrole.c" diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript index 3f88bfc..9d4822d 100644 --- a/3rdParty/LibIDN/SConscript +++ b/3rdParty/LibIDN/SConscript @@ -10,8 +10,6 @@ if env.get("LIBIDN_BUNDLED", False) : env["LIBIDN_FLAGS"] = { "CPPDEFINES": ["IDNA_STATIC"], "CPPPATH": [Dir("src")], - "LIBPATH": [Dir(".")], - "LIBS": ["Swiften_IDN"], } if env["PLATFORM"] == "win32" : env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")] @@ -51,7 +49,7 @@ if env.get("LIBIDN_BUNDLED", False) : if myenv["MSVC_VERSION"][:3] == "9.0" : myenv.Append(CPPPATH = "stubs/win32/VC2008") - myenv.StaticLibrary("Swiften_IDN", [ + env["LIBIDN_OBJECTS"] = myenv.StaticObject([ "src/stringprep.c", "src/profiles.c", "src/rfc3454.c", |