diff options
| author | Alexander Tkachev | 2016-07-15 18:27:56 +0600 |
|---|---|---|
| committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
| commit | 40dfb0b4f17590100b4dcfe212ee3f34369d788e (patch) | |
| tree | 07881fa43ab7654db908fd35453189824bfe8a8a /gui | |
| parent | 06ccfd4b9af518707f51550a5b3fe6af313c3bd0 (diff) | |
| download | scummvm-rg350-40dfb0b4f17590100b4dcfe212ee3f34369d788e.tar.gz scummvm-rg350-40dfb0b4f17590100b4dcfe212ee3f34369d788e.tar.bz2 scummvm-rg350-40dfb0b4f17590100b4dcfe212ee3f34369d788e.zip | |
GUI: Fix Cloud-related dialogs a little
Minor mistakes which lead to build failure in some cases.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/downloaddialog.h | 1 | ||||
| -rw-r--r-- | gui/editgamedialog.cpp | 1 | ||||
| -rw-r--r-- | gui/module.mk | 10 | ||||
| -rw-r--r-- | gui/options.cpp | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/gui/downloaddialog.h b/gui/downloaddialog.h index e91318bb86..cbeb78ab66 100644 --- a/gui/downloaddialog.h +++ b/gui/downloaddialog.h @@ -25,7 +25,6 @@ #include "gui/dialog.h" #include "common/str.h" -#include <backends/cloud/storage.h> namespace GUI { class LauncherDialog; diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp index 28f71d7635..fbe76d228a 100644 --- a/gui/editgamedialog.cpp +++ b/gui/editgamedialog.cpp @@ -25,6 +25,7 @@ #include "common/config-manager.h" #include "common/gui_options.h" #include "common/translation.h" +#include "common/system.h" #include "gui/browser.h" #include "gui/message.h" diff --git a/gui/module.mk b/gui/module.mk index 24becfd6fc..54818c264e 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -6,7 +6,6 @@ MODULE_OBJS := \ console.o \ debugger.o \ dialog.o \ - downloaddialog.o \ editgamedialog.o \ error.o \ EventRecorder.o \ @@ -18,10 +17,8 @@ MODULE_OBJS := \ object.o \ options.o \ predictivedialog.o \ - remotebrowser.o \ saveload.o \ saveload-dialog.o \ - storagewizarddialog.o \ themebrowser.o \ ThemeEngine.o \ ThemeEval.o \ @@ -61,6 +58,13 @@ MODULE_OBJS += \ endif endif +ifdef USE_LIBCURL +MODULE_OBJS += \ + downloaddialog.o \ + remotebrowser.o \ + storagewizarddialog.o +endif + ifdef ENABLE_EVENTRECORDER MODULE_OBJS += \ editrecorddialog.o \ diff --git a/gui/options.cpp b/gui/options.cpp index b8ff2d587c..f3afd58c96 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -42,11 +42,11 @@ #include "audio/musicplugin.h" #include "audio/mixer.h" #include "audio/fmopl.h" -#include "downloaddialog.h" #include "widgets/scrollcontainer.h" #ifdef USE_LIBCURL #include "backends/cloud/cloudmanager.h" +#include "gui/downloaddialog.h" #include "gui/storagewizarddialog.h" #endif |