diff --git a/Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp b/Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp index 9c1456ef3..4b300a3f0 100644 --- a/Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp +++ b/Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp @@ -35,11 +35,6 @@ #include #include -// Missing Wayland features: -// - Application icon (xdg-toplevel-icon-v1) https://github.com/libsdl-org/SDL/pull/9584 -// - Color picker (xdg-desktop-portal?) https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Screenshot.html -// - - class LinuxDropFilesData : public IGuiData { public: diff --git a/Source/Engine/Platform/SDL/SDLPlatform.cpp b/Source/Engine/Platform/SDL/SDLPlatform.cpp index c7f00778e..b245a6e22 100644 --- a/Source/Engine/Platform/SDL/SDLPlatform.cpp +++ b/Source/Engine/Platform/SDL/SDLPlatform.cpp @@ -236,15 +236,10 @@ Float2 SDLPlatform::GetMousePosition() // use the last known reported position we got from received window events. return Input::GetMouseScreenPosition(); } - if (UsesX11()) -#elif PLATFORM_LINUX || PLATFORM_MAC - { - Float2 pos; - SDL_GetGlobalMouseState(&pos.X, &pos.Y); - return pos; - } #endif - return Input::GetMouseScreenPosition(); + Float2 pos; + SDL_GetGlobalMouseState(&pos.X, &pos.Y); + return pos; } void SDLPlatform::SetMousePosition(const Float2& pos) diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/SDL.cs b/Source/Tools/Flax.Build/Deps/Dependencies/SDL.cs index 89c1dd4d0..ad8597873 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/SDL.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/SDL.cs @@ -48,7 +48,7 @@ namespace Flax.Deps.Dependencies { string root = options.IntermediateFolder; string configuration = "Release"; - const bool buildStatic = true; + bool buildStatic = true; var configs = new string[] { "-DSDL_TEST_LIBRARY=OFF", @@ -94,6 +94,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: