Swiftdiff options
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/JID/JID.h | 3 | ||||
| -rw-r--r-- | Swiften/SConscript | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Swiften/JID/JID.h b/Swiften/JID/JID.h index 876daa0..756db98 100644 --- a/Swiften/JID/JID.h +++ b/Swiften/JID/JID.h @@ -7,7 +7,8 @@ #pragma once #include <string> -#include <iosfwd> +//#include <iosfwd> +#include <iostream> namespace Swift { /** diff --git a/Swiften/SConscript b/Swiften/SConscript index d98c9b7..6d38717 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -201,15 +201,16 @@ if env["SCONS_STAGE"] == "build" : "LinkLocal", "StreamManagement", "Component", - "Config", "AdHoc" ]) - SConscript(test_only = True, dirs = [ + if env["build_examples"] : + SConscript(dirs = [ + "Config", + "Examples" + ]) + env.SConscript(test_only = True, dirs = [ "QA", ]) - SConscript(dirs = [ - "Examples" - ]) myenv = swiften_env.Clone() if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) : |