Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS libpng, SDL_window fixes #1246

Merged
merged 2 commits into from
Nov 12, 2024
Merged

macOS libpng, SDL_window fixes #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90271a7
[macOS] Force UseInternalLibPNG ON
taysta Nov 12, 2024
8a6429c
[macOS] SDL window fix from https://github.com/ec-/Quake3e/pull/295, …
taysta Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ endif()

if(APPLE)
set(UseInternalJPEGDefault ON)
set(UseInternalPNGDefault ON)
endif()

option(UseInternalOpenAL "If set, use bundled OpenAL." ${UseInternalOpenALDefault})
Expand Down
6 changes: 5 additions & 1 deletion shared/sdl/sdl_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading