Merge remote-tracking branch 'origin/master' into version/4.1

2023-11-11 15:47:04 +01:00
parent e88c6b4a94 8637066855
commit 8e985de5d2
26 changed files with 219 additions and 107 deletions
--- a/src/unix/unix.c
+++ b/src/unix/unix.c
@@ -60,6 +60,7 @@ extern wchar_t  sdl_win_title[512];
 plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
 joystick_t      joystick_state[MAX_JOYSTICKS];
 int             joysticks_present;
+int             status_icons_fullscreen = 0; /* unused. */
 SDL_mutex      *blitmtx;
 SDL_threadID    eventthread;
 static int      exit_event         = 0;