diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86f0cb5b98..997c7958df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -388,6 +388,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) if( WIN32 ) set( CMAKE_CXX_FLAGS "-Wno-unknown-pragmas -Wno-comment -Wno-format ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "-D_UNICODE -DUNICODE ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_CXX_FLAGS "-D_WIN32_WINNT=0x0600 ${CMAKE_CXX_FLAGS}" ) set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode" ) endif() diff --git a/src/scripting/vm/jit_runtime.cpp b/src/scripting/vm/jit_runtime.cpp index 968fcc476e..5e922be6f2 100644 --- a/src/scripting/vm/jit_runtime.cpp +++ b/src/scripting/vm/jit_runtime.cpp @@ -1,4 +1,5 @@ +#include #include "jit.h" #include "jitintern.h" diff --git a/src/win32/win32vulkanvideo.cpp b/src/win32/win32vulkanvideo.cpp index 7abb338617..d2c2e7b40d 100644 --- a/src/win32/win32vulkanvideo.cpp +++ b/src/win32/win32vulkanvideo.cpp @@ -1,5 +1,6 @@ #include +#include #ifdef _WIN32 #define VK_USE_PLATFORM_WIN32_KHR @@ -49,7 +50,7 @@ bool I_GetVulkanPlatformExtensions(unsigned int *count, const char **names) else { const bool result = *count >= extensionCount; - *count = min(*count, extensionCount); + *count = std::min(*count, extensionCount); for (unsigned int i = 0; i < *count; ++i) {