From 3da38ca60b65d3f1bd67b049f3c4b2a90a4d6a19 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Tue, 5 Jul 2016 15:05:30 +0600
Subject: CLOUD: Replace USE_CLOUD with USE_LIBCURL

In most cases that's the right one to check. USE_CLOUD is defined when
either USE_LIBCURL or USE_SDL_NET are, which means if there is no curl,
USE_CLOUD still could be defined and linking errors would appear.
---
 base/main.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index 6c91305381..dd2c3f54e6 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -66,10 +66,8 @@
 #endif
 
 #include "backends/keymapper/keymapper.h"
-#ifdef USE_CLOUD
-#include "backends/cloud/cloudmanager.h"
-#endif
 #ifdef USE_LIBCURL
+#include "backends/cloud/cloudmanager.h"
 #include "backends/networking/curl/connectionmanager.h"
 #endif
 #ifdef USE_SDL_NET
@@ -485,7 +483,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	}
 #endif
 		
-#ifdef USE_CLOUD
+#ifdef USE_LIBCURL
 	CloudMan.init();
 	CloudMan.syncSaves();
 	CloudMan.testFeature(); //TODO: remove later
@@ -604,8 +602,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 #endif
 #ifdef USE_LIBCURL
 	Networking::ConnectionManager::destroy();
-#endif
-#ifdef USE_CLOUD
 	//I think it's important to destroy it after ConnectionManager
 	Cloud::CloudManager::destroy();
 #endif
-- 
cgit v1.2.3