From adeb4b46d5d5f9d8902cea421d53816697a7993b Mon Sep 17 00:00:00 2001 From: fuzzard Date: Mon, 13 Sep 2021 16:25:29 +1000 Subject: [osx] change explicit HAS_SDL define to TARGET_DARWIN_OSX OSX is the last platform utilising SDL, change define to target platform --- xbmc/powermanagement/PowerManager.cpp | 2 +- xbmc/settings/AdvancedSettings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp index 54a1801d56..e45ec0cf35 100644 --- a/xbmc/powermanagement/PowerManager.cpp +++ b/xbmc/powermanagement/PowerManager.cpp @@ -208,7 +208,7 @@ void CPowerManager::OnWake() if (dialog) dialog->Close(true); // force close. no closing animation, sound etc at this early stage -#if defined(HAS_SDL) || defined(TARGET_WINDOWS) +#if defined(TARGET_DARWIN_OSX) || defined(TARGET_WINDOWS) if (CServiceBroker::GetWinSystem()->IsFullScreen()) { #if defined(TARGET_WINDOWS_DESKTOP) diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 9590325d0a..1081845f50 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -904,7 +904,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) #if defined(TARGET_WINDOWS_DESKTOP) XMLUtils::GetBoolean(pRootElement, "minimizetotray", m_minimizeToTray); #endif -#if defined(HAS_SDL) || defined(TARGET_WINDOWS) +#if defined(TARGET_DARWIN_OSX) || defined(TARGET_WINDOWS) XMLUtils::GetBoolean(pRootElement, "fullscreen", m_startFullScreen); #endif XMLUtils::GetBoolean(pRootElement, "splash", m_splashImage); -- cgit v1.2.3