From ad3ab61241d5878c9b66f78f3927adb97f5a84e8 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Fri, 16 Oct 2015 20:26:34 +0200
Subject: COMMON: Remove the EventRecorder dependency from OSystem

EventRecorder is in the gui lib which is not linked in the cxxtest suite.
---
 common/system.cpp | 7 -------
 common/system.h   | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'common')

diff --git a/common/system.cpp b/common/system.cpp
index 53f28cafa1..131a7d2580 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -30,9 +30,6 @@
 #include "common/taskbar.h"
 #include "common/updates.h"
 #include "common/textconsole.h"
-#ifdef ENABLE_EVENTRECORDER
-#include "gui/EventRecorder.h"
-#endif
 
 #include "backends/audiocd/default/default-audiocd.h"
 #include "backends/fs/fs-factory.h"
@@ -161,9 +158,5 @@ Common::TimerManager *OSystem::getTimerManager() {
 }
 
 Common::SaveFileManager *OSystem::getSavefileManager() {
-#ifdef ENABLE_EVENTRECORDER
-	return g_eventRec.getSaveManager(_savefileManager);
-#else
 	return _savefileManager;
-#endif
 }
diff --git a/common/system.h b/common/system.h
index 8896554f76..6d185d3075 100644
--- a/common/system.h
+++ b/common/system.h
@@ -1090,7 +1090,7 @@ public:
 	 * and other modifiable persistent game data. For more information,
 	 * refer to the SaveFileManager documentation.
 	 */
-	Common::SaveFileManager *getSavefileManager();
+	virtual Common::SaveFileManager *getSavefileManager();
 
 #if defined(USE_TASKBAR)
 	/**
-- 
cgit v1.2.3


From 8d34d5190db8a7af9a63c802e4f14a3b8a4ee7d1 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Thu, 28 Jul 2016 18:23:50 +0200
Subject: Revert "BUILD: Fix test compilation with event recorder enabled"

This reverts commit 1f8667c5d949070035390531e4f10c0f945d7352.
---
 common/recorderfile.cpp | 4 ----
 common/scummsys.h       | 4 ----
 2 files changed, 8 deletions(-)

(limited to 'common')

diff --git a/common/recorderfile.cpp b/common/recorderfile.cpp
index 04802aa0c8..71f8272b44 100644
--- a/common/recorderfile.cpp
+++ b/common/recorderfile.cpp
@@ -30,8 +30,6 @@
 #include "graphics/surface.h"
 #include "graphics/scaler.h"
 
-#ifdef ENABLE_EVENTRECORDER
-
 #define RECORD_VERSION 1
 
 namespace Common {
@@ -716,5 +714,3 @@ void PlaybackFile::checkRecordedMD5() {
 
 
 }
-
-#endif // ENABLE_EVENTRECORDER
diff --git a/common/scummsys.h b/common/scummsys.h
index 3513ee2d7d..5e1069fb46 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -215,10 +215,6 @@
 #include "config.h"
 #endif
 
-// Now we need to adjust some settings when running tests
-#ifdef COMPILING_TESTS
-#undef ENABLE_EVENTRECORDER
-#endif
 
 // In the following we configure various targets, in particular those
 // which can't use our "configure" tool and hence don't use config.h.
-- 
cgit v1.2.3