Merge pull request #1246 from taysta/ojk-macos

macOS libpng, SDL_window fixes
JACoders · Nov 12, 2024 · 199ddc7 · 199ddc7
2 parents cb52f9f + 8a6429c
commit 199ddc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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})

diff --git 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