From 6ae4de1f94e294612e5f7a3a677e8461d7d07f1f Mon Sep 17 00:00:00 2001 From: leo60228 Date: Thu, 19 Jun 2025 13:07:14 -0400 Subject: [PATCH] Fix TARGET_OS_IPHONE checks --- desktop_version/src/ButtonGlyphs.cpp | 2 +- desktop_version/src/FileSystemUtils.cpp | 2 +- desktop_version/src/Game.cpp | 2 +- desktop_version/src/Screen.cpp | 2 +- desktop_version/src/Vlogging.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop_version/src/ButtonGlyphs.cpp b/desktop_version/src/ButtonGlyphs.cpp index 3060fd42..82610025 100644 --- a/desktop_version/src/ButtonGlyphs.cpp +++ b/desktop_version/src/ButtonGlyphs.cpp @@ -178,7 +178,7 @@ bool BUTTONGLYPHS_keyboard_is_available(void) return true; } -#if defined(__ANDROID__) || defined(TARGET_OS_IPHONE) +#if defined(__ANDROID__) || TARGET_OS_IPHONE return false; #else return !SDL_GetHintBoolean("SteamDeck", SDL_FALSE); diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp index cd3e6e2c..beb41917 100644 --- a/desktop_version/src/FileSystemUtils.cpp +++ b/desktop_version/src/FileSystemUtils.cpp @@ -1331,7 +1331,7 @@ static int PLATFORM_getOSDirectory(char* output, const size_t output_size) } SDL_snprintf(output, output_size, "%s/", externalStoragePath); return 1; -#elif defined(TARGET_OS_IPHONE) +#elif TARGET_OS_IPHONE // (ab)use SDL APIs to get the path to the Documents folder without needing Objective-C const char* prefsPath = SDL_GetPrefPath("", ""); if (prefsPath == NULL) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 196c4d54..d41d63c9 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -381,7 +381,7 @@ void Game::init(void) screenshot_border_timer = 0; screenshot_saved_success = false; -#if defined(__ANDROID__) || defined(TARGET_OS_IPHONE) +#if defined(__ANDROID__) || TARGET_OS_IPHONE checkpoint_saving = true; #else checkpoint_saving = false; diff --git a/desktop_version/src/Screen.cpp b/desktop_version/src/Screen.cpp index 6dabc8ba..1bc4c29a 100644 --- a/desktop_version/src/Screen.cpp +++ b/desktop_version/src/Screen.cpp @@ -383,7 +383,7 @@ bool Screen::isForcedFullscreen(void) * If you're working on a tenfoot-only build, add a def that always * returns true! */ -#if defined(__ANDROID__) || defined(TARGET_OS_IPHONE) +#if defined(__ANDROID__) || TARGET_OS_IPHONE return true; #else return SDL_GetHintBoolean("SteamTenfoot", SDL_FALSE); diff --git a/desktop_version/src/Vlogging.c b/desktop_version/src/Vlogging.c index 8a3a730a..15c6a69a 100644 --- a/desktop_version/src/Vlogging.c +++ b/desktop_version/src/Vlogging.c @@ -3,7 +3,7 @@ #include #include -#if defined(__ANDROID__) || defined(TARGET_OS_IPHONE) +#if defined(__ANDROID__) || TARGET_OS_IPHONE // forward to SDL logging on Android, since stdout/stderr are /dev/null // they exist on iOS, but just get forwarded to the system log anyway, so might as well provide proper metadata #define VLOG_USE_SDL 1