Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-09 17:20:16 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-09 17:20:16 (GMT) |
| commit | f4d1b6494d5c537ba4a086d61ea86b1dd6843e4b (patch) | |
| tree | 2a673ed72d271dfaa7cc973c886c03b45881955a /Swiften | |
| parent | 8774d67aabd02086ec0663bb4567cef14bd513c6 (diff) | |
| download | swift-contrib-f4d1b6494d5c537ba4a086d61ea86b1dd6843e4b.zip swift-contrib-f4d1b6494d5c537ba4a086d61ea86b1dd6843e4b.tar.bz2 | |
Fixed windows compilation.
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Chat/ChatStateActionProvider.h | 13 | ||||
| -rw-r--r-- | Swiften/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp | 5 | ||||
| -rw-r--r-- | Swiften/TLS/SConscript | 10 |
4 files changed, 8 insertions, 22 deletions
diff --git a/Swiften/Chat/ChatStateActionProvider.h b/Swiften/Chat/ChatStateActionProvider.h deleted file mode 100644 index 9069152..0000000 --- a/Swiften/Chat/ChatStateActionProvider.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2010 Kevin Smith - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -namespace Swift { - class ChatState { - - }; -} diff --git a/Swiften/SConscript b/Swiften/SConscript index 49d745d..28db30d 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -268,7 +268,7 @@ if env["SCONS_STAGE"] == "build" : # Generate the Swiften header swiften_header = "#pragma once\n" top_path = env.Dir("..").abspath - public_dirs = ["Queries", "Client", "Component", "Elements", "Roster"] + public_dirs = ["Avatars", "Base", "Chat", "Client", "Component", "Disco", "Elements", "JID", "MUC", "Presence", "Queries", "Roster", "StringCodecs", "TLS", "VCards"] for public_dir in public_dirs : for root, dirs, files in os.walk(env.Dir(public_dir).abspath) : if root.endswith("UnitTest") : diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp index 5d9aac2..3f134e7 100644 --- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp +++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp @@ -6,10 +6,11 @@ #include "Swiften/TLS/OpenSSL/OpenSSLCertificate.h" -#include <openssl/x509v3.h> - #include "Swiften/Base/ByteArray.h" +#undef X509_NAME // Windows.h defines this, and for some reason, it doesn't get undeffed properly in x509.h +#include <openssl/x509v3.h> + #pragma GCC diagnostic ignored "-Wold-style-cast" namespace Swift { diff --git a/Swiften/TLS/SConscript b/Swiften/TLS/SConscript index bb33239..7408e72 100644 --- a/Swiften/TLS/SConscript +++ b/Swiften/TLS/SConscript @@ -7,16 +7,14 @@ objects = swiften_env.StaticObject([ "TLSContextFactory.cpp", ]) -if swiften_env.get("HAVE_OPENSSL", 0) : - objects += swiften_env.StaticObject([ +myenv = swiften_env.Clone() +if myenv.get("HAVE_OPENSSL", 0) : + myenv.MergeFlags(myenv["OPENSSL_FLAGS"]) + objects += myenv.StaticObject([ "OpenSSL/OpenSSLContext.cpp", "OpenSSL/OpenSSLCertificate.cpp", "OpenSSL/OpenSSLContextFactory.cpp", ]) - -myenv = swiften_env.Clone() -if myenv.get("HAVE_OPENSSL", 0) : - myenv.MergeFlags("OPENSSL_FLAGS") myenv.Append(CPPDEFINES = "HAVE_OPENSSL") objects += myenv.StaticObject(["PlatformTLSContextFactory.cpp"]) |