Merge pull request #1246 from taysta/ojk-macos

SomaZ · web-flow · commit 199ddc7642d0 · 2024-11-12T20:08:37.000+01:00
macOS libpng, SDL_window fixes
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

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,11 @@ static rserr_t GLimp_SetMode(glconfig_t glConfig, const windowDesc_t windowDes`
`421`	`421`
`422`	`422`	`if( fullscreen )`
`423`	`423`	`{`
`424`		`- flags \|= SDL_WINDOW_FULLSCREEN;`
	`424`	`+#ifdef MACOS_X`
	`425`	`+ flags \|= SDL_WINDOW_FULLSCREEN_DESKTOP;`
	`426`	`+#else`
	`427`	`+ flags \|= SDL_WINDOW_FULLSCREEN;`
	`428`	`+#endif`
`425`	`429`	`glConfig->isFullscreen = qtrue;`
`426`	`430`	`}`
`427`	`431`	`else`