From cb568c09e5c2482f2406954c022c3f7592c84055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 11 Nov 2024 19:45:46 +0100 Subject: [PATCH] Platform: fix unused variable warnings in {Glfw,Sdl2}Application on macOS. --- src/Magnum/Platform/GlfwApplication.cpp | 6 ++++++ src/Magnum/Platform/Sdl2Application.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/Magnum/Platform/GlfwApplication.cpp b/src/Magnum/Platform/GlfwApplication.cpp index 5fdc42735..f4b1bea88 100644 --- a/src/Magnum/Platform/GlfwApplication.cpp +++ b/src/Magnum/Platform/GlfwApplication.cpp @@ -168,17 +168,23 @@ Vector2 GlfwApplication::dpiScalingInternal(const Implementation::GlfwDpiScaling /* Use values from the configuration only if not overridden on command line to something non-default. In any case explicit scaling has a precedence before the policy. */ + #ifndef CORRADE_TARGET_APPLE Implementation::GlfwDpiScalingPolicy dpiScalingPolicy{}; + #endif if(!_commandLineDpiScaling.isZero()) { Debug{verbose} << "Platform::GlfwApplication: user-defined DPI scaling" << _commandLineDpiScaling; return _commandLineDpiScaling; } else if(_commandLineDpiScalingPolicy != Implementation::GlfwDpiScalingPolicy::Default) { + #ifndef CORRADE_TARGET_APPLE dpiScalingPolicy = _commandLineDpiScalingPolicy; + #endif } else if(!configurationDpiScaling.isZero()) { Debug{verbose} << "Platform::GlfwApplication: app-defined DPI scaling" << configurationDpiScaling; return configurationDpiScaling; } else { + #ifndef CORRADE_TARGET_APPLE dpiScalingPolicy = configurationDpiScalingPolicy; + #endif } /* There's no choice on Apple, it's all controlled by the plist file. So diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp index 70d5d1938..e1559208b 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp @@ -302,17 +302,23 @@ Vector2 Sdl2Application::dpiScalingInternal(const Implementation::Sdl2DpiScaling /* Use values from the configuration only if not overridden on command line to something non-default. In any case explicit scaling has a precedence before the policy. */ + #ifndef CORRADE_TARGET_APPLE Implementation::Sdl2DpiScalingPolicy dpiScalingPolicy{}; + #endif if(!_commandLineDpiScaling.isZero()) { Debug{verbose} << "Platform::Sdl2Application: user-defined DPI scaling" << _commandLineDpiScaling; return _commandLineDpiScaling; } else if(_commandLineDpiScalingPolicy != Implementation::Sdl2DpiScalingPolicy::Default) { + #ifndef CORRADE_TARGET_APPLE dpiScalingPolicy = _commandLineDpiScalingPolicy; + #endif } else if(!configurationDpiScaling.isZero()) { Debug{verbose} << "Platform::Sdl2Application: app-defined DPI scaling" << configurationDpiScaling; return configurationDpiScaling; } else { + #ifndef CORRADE_TARGET_APPLE dpiScalingPolicy = configurationDpiScalingPolicy; + #endif } /* There's no choice on Apple, it's all controlled by the plist file. So