Merge branch 'master' into vulkan

2020-05-27 19:48:22 +02:00
parent 8fa456bdf5 81f03f04e5
commit 68208f5426
179 changed files with 41359 additions and 5418 deletions
--- a/src/Nazara/Platform/VideoMode.cpp
+++ b/src/Nazara/Platform/VideoMode.cpp
@@ -5,15 +5,7 @@
 #include <Nazara/Platform/VideoMode.hpp>
 #include <algorithm>
 #include <functional>
-
-#if defined(NAZARA_PLATFORM_WINDOWS)
-	#include <Nazara/Platform/Win32/VideoModeImpl.hpp>
-#elif defined(NAZARA_PLATFORM_X11)
-	#include <Nazara/Platform/X11/VideoModeImpl.hpp>
-#else
-	#error Lack of implementation: Window
-#endif
-
+#include <Nazara/Platform/SDL2/VideoModeImpl.hpp>
 #include <Nazara/Platform/Debug.hpp>

 namespace Nz