From 90271a79c8b0269444e19d88af42fb3518209ab4 Mon Sep 17 00:00:00 2001 From: tayst Date: Wed, 13 Nov 2024 00:27:15 +0800 Subject: [PATCH 1/2] [macOS] Force UseInternalLibPNG ON --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4947258619..08ca053594 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,7 @@ endif() if(APPLE) set(UseInternalJPEGDefault ON) + set(UseInternalPNGDefault ON) endif() option(UseInternalOpenAL "If set, use bundled OpenAL." ${UseInternalOpenALDefault}) From 8a6429c0d0e10424cf997a568bf77ca3d2887f68 Mon Sep 17 00:00:00 2001 From: tayst Date: Wed, 13 Nov 2024 00:52:18 +0800 Subject: [PATCH 2/2] [macOS] SDL window fix from https://github.com/ec-/Quake3e/pull/295, allows for tabbing out of the game, configuring the game for macbooks with notches, and macOS game mode --- shared/sdl/sdl_window.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shared/sdl/sdl_window.cpp b/shared/sdl/sdl_window.cpp index 8ff66a8e4b..18daa067dc 100644 --- a/shared/sdl/sdl_window.cpp +++ b/shared/sdl/sdl_window.cpp @@ -421,7 +421,11 @@ static rserr_t GLimp_SetMode(glconfig_t *glConfig, const windowDesc_t *windowDes if( fullscreen ) { - flags |= SDL_WINDOW_FULLSCREEN; +#ifdef MACOS_X + flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; +#else + flags |= SDL_WINDOW_FULLSCREEN; +#endif glConfig->isFullscreen = qtrue; } else