From 196cc38da19b867eaa9419343dd6ecd8212af354 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 8 Oct 2012 19:48:26 +0300 Subject: Fix compilation errors and warnings in different modes. --- src/test/testmain.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/test/testmain.cpp') diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 535cfebc4..dec7b3248 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -18,8 +18,10 @@ * along with this program. If not, see . */ + #include "test/testmain.h" +#ifdef USE_OPENGL #include "utils/gettext.h" #include "client.h" @@ -205,7 +207,7 @@ int TestMain::exec(const bool testAudio) void TestMain::writeConfig(const int openGLMode, const int rescale, const int sound, const std::string &info, - const int batchSize, const int detectMode) + const int batchSize A_UNUSED, const int detectMode) { mConfig.init(Client::getConfigDirectory() + "/config.xml"); @@ -297,39 +299,28 @@ int TestMain::invokeSoftwareRenderTest(std::string test) int TestMain::invokeFastOpenGLRenderTest(std::string test) { -#if defined USE_OPENGL mConfig.setValue("opengl", 1); mConfig.write(); const int ret = execFileWait(fileName, fileName, "-t", test, 30); log->log("%s: %d", test.c_str(), ret); return ret; -#else - return -1; -#endif } int TestMain::invokeFastOpenBatchTest(std::string test) { -#if defined USE_OPENGL mConfig.setValue("opengl", 1); mConfig.write(); const int ret = execFileWait(fileName, fileName, "-t", test, 30); // log->log("%s: %d", test.c_str(), ret); return ret; -#else - return -1; -#endif } int TestMain::invokeSafeOpenGLRenderTest(std::string test) { -#if defined USE_OPENGL mConfig.setValue("opengl", 2); mConfig.write(); const int ret = execFileWait(fileName, fileName, "-t", test, 30); log->log("%s: %d", test.c_str(), ret); return ret; -#else - return -1; -#endif } +#endif -- cgit v1.2.3-70-g09d2