aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEugene Sandulenko2016-10-17 18:45:12 +0200
committerEugene Sandulenko2016-10-17 18:55:22 +0200
commite8b70a4686916774a1bf499c9c3136e3052b6b43 (patch)
tree93ca440db8e01bf53376909ebb5670f961613c8b /base
parentd3c173da7aa3ffcb62243816bd74ccb4ca3ec5b2 (diff)
downloadscummvm-rg350-e8b70a4686916774a1bf499c9c3136e3052b6b43.tar.gz
scummvm-rg350-e8b70a4686916774a1bf499c9c3136e3052b6b43.tar.bz2
scummvm-rg350-e8b70a4686916774a1bf499c9c3136e3052b6b43.zip
ALL: Fix compilation with disabled cloud but enabled libcurl
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/base/main.cpp b/base/main.cpp
index ca3a764f3a..42f5910b3b 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -66,6 +66,7 @@
#endif
#include "backends/keymapper/keymapper.h"
+#ifdef USE_CLOUD
#ifdef USE_LIBCURL
#include "backends/cloud/cloudmanager.h"
#include "backends/networking/curl/connectionmanager.h"
@@ -73,6 +74,7 @@
#ifdef USE_SDL_NET
#include "backends/networking/sdl_net/localwebserver.h"
#endif
+#endif
#if defined(_WIN32_WCE)
#include "backends/platform/wince/CELauncherDialog.h"
@@ -485,7 +487,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
}
#endif
-#ifdef USE_LIBCURL
+#if defined(USE_CLOUD) && defined(USE_LIBCURL)
CloudMan.init();
CloudMan.syncSaves();
#endif
@@ -598,6 +600,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
launcherDialog();
}
}
+#ifdef USE_CLOUD
#ifdef USE_SDL_NET
Networking::LocalWebserver::destroy();
#endif
@@ -606,6 +609,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
//I think it's important to destroy it after ConnectionManager
Cloud::CloudManager::destroy();
#endif
+#endif
PluginManager::instance().unloadAllPlugins();
PluginManager::destroy();
GUI::GuiManager::destroy();