Swiftdiff options
Diffstat (limited to 'Swiften/SConscript')
| -rw-r--r-- | Swiften/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript index 258b566..ecf32ef 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -187,19 +187,18 @@ if env["SCONS_STAGE"] == "build" : "Serializer/XML/XMLElement.cpp", "Serializer/XML/XMLNode.cpp", "Serializer/XMPPSerializer.cpp", "Session/Session.cpp", "Session/SessionTracer.cpp", "Session/SessionStream.cpp", "Session/BasicSessionStream.cpp", "Session/BOSHSessionStream.cpp", "StringCodecs/Base64.cpp", - "StringCodecs/SHA1.cpp", "StringCodecs/SHA256.cpp", "StringCodecs/MD5.cpp", "StringCodecs/Hexify.cpp", ] SConscript(dirs = [ "Avatars", "Base", "IDN", @@ -224,19 +223,25 @@ if env["SCONS_STAGE"] == "build" : if env["build_examples"] : SConscript(dirs = [ "Config", "Examples" ]) env.SConscript(test_only = True, dirs = [ "QA", ]) + myenv = swiften_env.Clone() + if myenv["PLATFORM"] == "win32": + sources.append("StringCodecs/SHA1_Windows.cpp") + else: + sources.append("StringCodecs/SHA1.cpp") + if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) : env.MergeFlags(env["GCONF_FLAGS"]) if ARGUMENTS.get("swiften_dll", False) : if myenv["PLATFORM"] == "posix" : myenv.Append(LINKFLAGS = ["-Wl,-soname,libSwiften.so.$SWIFTEN_VERSION_MAJOR"]) myenv["SHLIBSUFFIX"] = "" elif myenv["PLATFORM"] == "darwin" : myenv.Append(LINKFLAGS = ["-Wl,-install_name,libSwiften.so.$SWIFTEN_VERSION_MAJOR", "-Wl,-compatibility_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}", "-Wl,-current_version,${SWIFTEN_VERSION_MAJOR}.${SWIFTEN_VERSION_MINOR}"]) swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_FILE"], sources + swiften_env["SWIFTEN_OBJECTS"]) |