diff options
| author | Eugene Sandulenko | 2016-10-17 18:55:01 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-10-17 18:55:22 +0200 |
| commit | c5e233b66b1acff08b2506f6536253bb6af8c851 (patch) | |
| tree | 7c6853e87bd122f2dd3c247417e1be175e89dc9d /gui | |
| parent | e8b70a4686916774a1bf499c9c3136e3052b6b43 (diff) | |
| download | scummvm-rg350-c5e233b66b1acff08b2506f6536253bb6af8c851.tar.gz scummvm-rg350-c5e233b66b1acff08b2506f6536253bb6af8c851.tar.bz2 scummvm-rg350-c5e233b66b1acff08b2506f6536253bb6af8c851.zip | |
ALL: Fix compilation with enabled sdl_net and disabled cloud
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/options.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 7965cfd752..4ebb60b18d 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1312,7 +1312,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher) ScrollContainerWidget *container = new ScrollContainerWidget(tab, "GlobalOptions_Cloud.Container", kCloudTabContainerReflowCmd); container->setTarget(this); -#if defined(USE_CLOUD) && defined(USE_LIBCURL) +#ifdef USE_LIBCURL _selectedStorageIndex = CloudMan.getStorageIndex(); #else _selectedStorageIndex = 0; @@ -1320,7 +1320,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher) _storagePopUpDesc = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.StoragePopupDesc", _("Storage:"), _("Active cloud storage")); _storagePopUp = new PopUpWidget(container, "GlobalOptions_Cloud_Container.StoragePopup"); -#if defined(USE_CLOUD) && defined(USE_LIBCURL) +#ifdef USE_LIBCURL Common::StringArray list = CloudMan.listStorages(); for (uint32 i = 0; i < list.size(); ++i) _storagePopUp->appendEntry(list[i], i); @@ -1368,7 +1368,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher) #ifdef USE_SDL_NET _serverWasRunning = false; #endif -#endif +#endif // USE_CLOUD // Activate the first tab tab->setActiveTab(0); @@ -1553,6 +1553,7 @@ void GlobalOptionsDialog::close() { } } #endif // USE_LIBCURL + #ifdef USE_SDL_NET #ifdef NETWORKING_LOCALWEBSERVER_ENABLE_PORT_OVERRIDE // save server's port @@ -1567,7 +1568,7 @@ void GlobalOptionsDialog::close() { #endif // USE_SDL_NET #endif // USE_CLOUD } -#ifdef USE_SDL_NET +#if defined(USE_CLOUD) && defined(USE_SDL_NET) if (LocalServer.isRunning()) { LocalServer.stop(); } |