From b36cb1ef17e4bad9632405f7c5dc9b96ef509827 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Sun, 15 Apr 2018 12:41:54 +0200 Subject: [PATCH] Fix retroshare GUI building with no_libresapihttpserver --- retroshare-gui/src/gui/MainWindow.cpp | 5 ++++- retroshare-gui/src/gui/settings/rsettingswin.cpp | 5 ++++- retroshare-gui/src/main.cpp | 9 ++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 6219575b5..116b9637f 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -107,10 +107,13 @@ #include "gui/common/RsCollection.h" #include "settings/rsettingswin.h" #include "settings/rsharesettings.h" -#include "settings/WebuiPage.h" #include "common/StatusDefs.h" #include "gui/notifyqt.h" +#ifdef ENABLE_WEBUI +# include "settings/WebuiPage.h" +#endif + #include #include diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp index 3a7df34c9..0a2b348f0 100644 --- a/retroshare-gui/src/gui/settings/rsettingswin.cpp +++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp @@ -41,12 +41,15 @@ #include "PostedPage.h" #include "PluginsPage.h" #include "ServicePermissionsPage.h" -#include "WebuiPage.h" #include "rsharesettings.h" #include "gui/notifyqt.h" #include "gui/common/FloatingHelpBrowser.h" #include "gui/common/RSElidedItemDelegate.h" +#ifdef ENABLE_WEBUI +# include "WebuiPage.h" +#endif + #define IMAGE_GENERAL ":/images/kcmsystem24.png" #define ITEM_SPACING 2 diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index 54979f983..acd56d9ef 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -41,16 +41,19 @@ #include "gui/FileTransfer/TransfersDialog.h" #include "gui/settings/RsharePeerSettings.h" #include "gui/settings/rsharesettings.h" -#include "gui/settings/WebuiPage.h" #include "idle/idle.h" #include "lang/languagesupport.h" #include "util/RsGxsUpdateBroadcast.h" #include "util/rsdir.h" #include "util/rstime.h" +#ifdef ENABLE_WEBUI +# include "gui/settings/WebuiPage.h" +#endif + #ifdef RETROTOR -#include "TorControl/TorManager.h" -#include "TorControl/TorControlWindow.h" +# include "TorControl/TorManager.h" +# include "TorControl/TorControlWindow.h" #endif #include "retroshare/rsidentity.h"