diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec1cfaeb78..c675cc69d5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -559,7 +559,7 @@ if( HAVE_MMX ) gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp - gamedata/textures/hires/gl_hqresize.cpp + gamedata/textures/hires/hqresize.cpp PROPERTIES COMPILE_FLAGS "-mmmx" ) endif( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) endif( HAVE_MMX ) diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index b8738ed0dd..0d4c7ddce0 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -432,10 +432,10 @@ SDLVideo::SDLVideo () } #endif // !SDL2_STATIC_LIBRARY + Priv::softpolyEnabled = vid_preferbackend == 2; #ifdef HAVE_VULKAN Priv::vulkanEnabled = vid_preferbackend == 1 && Priv::Vulkan_GetDrawableSize && Priv::Vulkan_GetInstanceExtensions && Priv::Vulkan_CreateSurface; - Priv::softpolyEnabled = vid_preferbackend == 2; if (Priv::vulkanEnabled) { @@ -446,11 +446,11 @@ SDLVideo::SDLVideo () Priv::vulkanEnabled = false; } } - else if (Priv::softpolyEnabled) +#endif + if (Priv::softpolyEnabled) { Priv::CreateWindow(SDL_WINDOW_HIDDEN); } -#endif } SDLVideo::~SDLVideo ()