diff options
| author | Eugene Sandulenko | 2016-08-30 13:54:12 +0200 |
|---|---|---|
| committer | GitHub | 2016-08-30 13:54:12 +0200 |
| commit | bfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d (patch) | |
| tree | 68851bdc99b78b4b1902944c1df3c3ee5d4f4489 /base | |
| parent | 7df744c291e5fcf5dc7afd3b21189c2c56810f8e (diff) | |
| parent | 368f664c813075f8b8cb2c572dce65f60128eda4 (diff) | |
| download | scummvm-rg350-bfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d.tar.gz scummvm-rg350-bfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d.tar.bz2 scummvm-rg350-bfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d.zip | |
Merge pull request #788 from Tkachov/cloud
ALL: Add Cloud storage support
Diffstat (limited to 'base')
| -rw-r--r-- | base/main.cpp | 20 | ||||
| -rw-r--r-- | base/version.cpp | 21 |
2 files changed, 41 insertions, 0 deletions
diff --git a/base/main.cpp b/base/main.cpp index 1667106543..6b6868b78a 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -66,6 +66,13 @@ #endif #include "backends/keymapper/keymapper.h" +#ifdef USE_LIBCURL +#include "backends/cloud/cloudmanager.h" +#include "backends/networking/curl/connectionmanager.h" +#endif +#ifdef USE_SDL_NET +#include "backends/networking/sdl_net/localwebserver.h" +#endif #if defined(_WIN32_WCE) #include "backends/platform/wince/CELauncherDialog.h" @@ -475,6 +482,11 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { dlg.runModal(); } #endif + +#ifdef USE_LIBCURL + CloudMan.init(); + CloudMan.syncSaves(); +#endif // Unless a game was specified, show the launcher dialog if (0 == ConfMan.getActiveDomain()) @@ -584,6 +596,14 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { launcherDialog(); } } +#ifdef USE_SDL_NET + Networking::LocalWebserver::destroy(); +#endif +#ifdef USE_LIBCURL + Networking::ConnectionManager::destroy(); + //I think it's important to destroy it after ConnectionManager + Cloud::CloudManager::destroy(); +#endif PluginManager::instance().unloadAllPlugins(); PluginManager::destroy(); GUI::GuiManager::destroy(); diff --git a/base/version.cpp b/base/version.cpp index 299e4ce325..d40dd573f0 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -154,4 +154,25 @@ const char *gScummVMFeatures = "" #ifdef ENABLE_VKEYBD "virtual keyboard " #endif + +#ifdef USE_CLOUD + "cloud (" +#ifdef USE_LIBCURL + "servers" +#ifdef USE_SDL_NET + ", " +#endif +#endif +#ifdef USE_SDL_NET + "local" +#endif + ") " +#else +#ifdef USE_LIBCURL + "libcurl " +#endif +#ifdef USE_SDL_NET + "SDL_net " +#endif +#endif ; |