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 ----
 test/module.mk          | 1 -
 3 files changed, 9 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.
diff --git a/test/module.mk b/test/module.mk
index e591854ace..11ee6bd200 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -26,7 +26,6 @@ endif
 #TEST_LDFLAGS += -L/usr/X11R6/lib -lX11
 
 
-test: CXXFLAGS +=  -DCOMPILING_TESTS=1
 test: test/runner
 	./test/runner
 test/runner: test/runner.cpp $(TEST_LIBS)
-- 
cgit v1.2.3