Merge branch 'master' into jgrpp

# Conflicts: # src/os/windows/crashlog_win.cpp # src/os/windows/font_win32.cpp # src/os/windows/win32.cpp # src/os/windows/win32.h # src/video/win32_v.cpp # src/video/win32_v.h
2024-01-12 18:57:14 +00:00
parent 0436dd1abe 03df70ce8a
commit 8ae1587987
27 changed files with 378 additions and 112 deletions
--- a/src/video/win32_v.h
+++ b/src/video/win32_v.h
@@ -14,6 +14,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <vector>
+#include <windows.h>

 /** Base class for Windows video drivers. */
 class VideoDriver_Win32Base : public VideoDriver {