diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 75f294a78b6..10dde2d511e 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -139,7 +139,7 @@ if _OPTIONS["targetos"]=="windows" then defines { "UNICODE", "_UNICODE", - "_WIN32_WINNT=0x0501", + "_WIN32_WINNT=0x0600", "WIN32_LEAN_AND_MEAN", "NOMINMAX", } diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 85b0cd810f3..9389c4ecca1 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -3,16 +3,12 @@ defines { "OSD_WINDOWS", + "UNICODE", + "_UNICODE" "WIN32_LEAN_AND_MEAN", "NOMINMAX", } -configuration { "mingw* or vs*" } - defines { - "UNICODE", - "_UNICODE" - } - configuration { "vs*" } flags { "Unicode", diff --git a/src/osd/asio.h b/src/osd/asio.h index d59a90b8929..0643bf332b4 100644 --- a/src/osd/asio.h +++ b/src/osd/asio.h @@ -18,18 +18,12 @@ #endif #if defined(_WIN32) && !defined(_WIN32_WINNT) -#if defined(OSD_WINDOWS) -#define _WIN32_WINNT 0x0501 -#else -#define _WIN32_WINNT 0x0603 -#endif +#define _WIN32_WINNT 0x0600 #endif + #define ASIO_HEADER_ONLY #define ASIO_STANDALONE #define ASIO_SEPARATE_COMPILATION -#define ASIO_NOEXCEPT noexcept(true) -#define ASIO_NOEXCEPT_OR_NOTHROW noexcept(true) -#define ASIO_ERROR_CATEGORY_NOEXCEPT noexcept(true) #include #undef interface