aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzard <fuzzard@users.noreply.github.com>2021-09-20 17:40:20 +1000
committerGitHub <noreply@github.com>2021-09-20 17:40:20 +1000
commit519c74b1f7ba6ee1106ea3287f242e24c186d8aa (patch)
treeb9ca25dee5dbfb0b0b74e9ad15c10c9963c15f77
parent5ed343b5a457961258c586ca0a777ecfd1ca19a2 (diff)
parentadeb4b46d5d5f9d8902cea421d53816697a7993b (diff)
Merge pull request #20137 from fuzzard/osx_hassdl
[osx] change explicit HAS_SDL define to TARGET_DARWIN_OSX
-rw-r--r--xbmc/powermanagement/PowerManager.cpp2
-rw-r--r--xbmc/settings/AdvancedSettings.cpp2
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);