From 16943e644f3d9e9111a70a714d82e6f19eb95c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 13 Apr 2016 17:44:58 +0200 Subject: [PATCH] Test: reorder preprocessor branches. --- src/Magnum/Test/AbstractOpenGLTester.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h index b8778334d..ab212290b 100644 --- a/src/Magnum/Test/AbstractOpenGLTester.h +++ b/src/Magnum/Test/AbstractOpenGLTester.h @@ -92,15 +92,7 @@ std::optional AbstractOpenGLTester:: #define MAGNUM_VERIFY_NO_ERROR() CORRADE_COMPARE(Magnum::Renderer::error(), Magnum::Renderer::Error::NoError) -#ifndef CORRADE_TARGET_WINDOWS -#define MAGNUM_GL_TEST_MAIN(Class) \ - int main(int argc, char** argv) { \ - Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv); \ - Class t; \ - t.registerTest(__FILE__, #Class); \ - return t.exec(argc, argv); \ - } -#else +#ifdef CORRADE_TARGET_WINDOWS #define MAGNUM_GL_TEST_MAIN(Class) \ LRESULT CALLBACK windowProcedure(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); \ LRESULT CALLBACK windowProcedure(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { \ @@ -124,6 +116,14 @@ std::optional AbstractOpenGLTester:: Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv, nullptr); \ return Magnum::Platform::WindowlessApplication::create(windowProcedure); \ } +#else +#define MAGNUM_GL_TEST_MAIN(Class) \ + int main(int argc, char** argv) { \ + Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv); \ + Class t; \ + t.registerTest(__FILE__, #Class); \ + return t.exec(argc, argv); \ + } #endif }}