aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBastien Bouclet2016-07-28 18:23:50 +0200
committerBastien Bouclet2016-07-28 18:23:50 +0200
commit8d34d5190db8a7af9a63c802e4f14a3b8a4ee7d1 (patch)
treebb738672a20fab225f56f1e2e73bd10c574e6536 /common
parentad3ab61241d5878c9b66f78f3927adb97f5a84e8 (diff)
downloadscummvm-rg350-8d34d5190db8a7af9a63c802e4f14a3b8a4ee7d1.tar.gz
scummvm-rg350-8d34d5190db8a7af9a63c802e4f14a3b8a4ee7d1.tar.bz2
scummvm-rg350-8d34d5190db8a7af9a63c802e4f14a3b8a4ee7d1.zip
Revert "BUILD: Fix test compilation with event recorder enabled"
This reverts commit 1f8667c5d949070035390531e4f10c0f945d7352.
Diffstat (limited to 'common')
-rw-r--r--common/recorderfile.cpp4
-rw-r--r--common/scummsys.h4
2 files changed, 0 insertions, 8 deletions
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.