Merge branch 'master' into opengl3

[irrlicht.git] / source / Irrlicht / CIrrDeviceSDL.cpp

diff --git a/source/Irrlicht/CIrrDeviceSDL.cpp b/source/Irrlicht/CIrrDeviceSDL.cpp
index ecd8a8da1352bdcceb66bfe9e1275eb75e4748f6..b0c774797be01d5793304d12c05a187e9bae9b1a 100644 (file)
--- a/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/source/Irrlicht/CIrrDeviceSDL.cpp
@@ -345,13 +345,16 @@ void CIrrDeviceSDL::logAttributes()
 bool CIrrDeviceSDL::createWindow()\r
 {\r
        if (CreationParams.Fullscreen) {\r
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_\r
                SDL_Flags |= SDL_WINDOW_FULLSCREEN;\r
-       } else  {\r
-               if (Resizable)\r
-                       SDL_Flags |= SDL_WINDOW_RESIZABLE;\r
-               if (CreationParams.WindowMaximized)\r
-                       SDL_Flags |= SDL_WINDOW_MAXIMIZED;\r
+#else\r
+               SDL_Flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;\r
+#endif\r
        }\r
+       if (Resizable)\r
+               SDL_Flags |= SDL_WINDOW_RESIZABLE;\r
+       if (CreationParams.WindowMaximized)\r
+               SDL_Flags |= SDL_WINDOW_MAXIMIZED;\r
        SDL_Flags |= SDL_WINDOW_OPENGL;\r
 \r
 #ifdef _IRR_EMSCRIPTEN_PLATFORM_\r