[Scummvm-git-logs] scummvm master -> d602850b0c3bd9e99d729da335ac3f068c5cd73a

sev- sev at scummvm.org
Sun Apr 30 09:42:51 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d602850b0c TESTBED: Fix building with --disable-cloud (#938)


Commit: d602850b0c3bd9e99d729da335ac3f068c5cd73a
    https://github.com/scummvm/scummvm/commit/d602850b0c3bd9e99d729da335ac3f068c5cd73a
Author: Tarek Soliman (tarek at bashasoliman.com)
Date: 2017-04-30T09:42:48+02:00

Commit Message:
TESTBED: Fix building with --disable-cloud (#938)

The linker fails when building with --disable-cloud and not
passing --disable-libcurl

Changed paths:
    engines/testbed/module.mk
    engines/testbed/testbed.cpp


diff --git a/engines/testbed/module.mk b/engines/testbed/module.mk
index 99e6157..be733a5 100644
--- a/engines/testbed/module.mk
+++ b/engines/testbed/module.mk
@@ -14,7 +14,7 @@ MODULE_OBJS := \
 	testbed.o \
 	testsuite.o
 
-ifdef USE_LIBCURL
+ifdef USE_CLOUD
 MODULE_OBJS += \
 	cloud.o
 endif
diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp
index 5943d47..b6364c9 100644
--- a/engines/testbed/testbed.cpp
+++ b/engines/testbed/testbed.cpp
@@ -39,7 +39,7 @@
 #include "testbed/savegame.h"
 #include "testbed/sound.h"
 #include "testbed/testbed.h"
-#ifdef USE_LIBCURL
+#ifdef USE_CLOUD
 #include "testbed/cloud.h"
 #endif
 #ifdef USE_SDL_NET
@@ -140,7 +140,7 @@ TestbedEngine::TestbedEngine(OSystem *syst)
 	// Midi
 	ts = new MidiTestSuite();
 	_testsuiteList.push_back(ts);
-#ifdef USE_LIBCURL
+#ifdef USE_CLOUD
 	// Cloud
 	ts = new CloudTestSuite();
 	_testsuiteList.push_back(ts);





More information about the Scummvm-git-logs mailing list