- define _WIN32_WINNT to 0x600 (Vista) in the CMake project instead of littering all files with inconsistent settings for the target version.

CMakeLists.txt

@@ -219,7 +219,7 @@ if( MSVC )
 	set( DEB_C_FLAGS "/D _CRTDBG_MAP_ALLOC /MTd" )
 
 	# Disable warnings for unsecure CRT functions from VC8+
-	set( ALL_C_FLAGS "${ALL_C_FLAGS} /wd4996 /DUNICODE /D_UNICODE" )
+	set( ALL_C_FLAGS "${ALL_C_FLAGS} /wd4996 /DUNICODE /D_UNICODE /D_WIN32_WINNT=0x0600" )
 
 	# The CMake configurations set /GR and /MD by default, which conflict with our settings.
 	string(REPLACE "/MD " " " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} )

src/d_anonstats.cpp

@@ -12,7 +12,6 @@ void D_ConfirmSendStats()
 #else // !NO_SEND_STATS
 
 #if defined(_WIN32)
-#define _WIN32_WINNT 0x0501
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winsock2.h>

src/win32/hardware.cpp

@@ -32,7 +32,6 @@
 **
 */
 
-#define _WIN32_WINNT 0x0501
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <mmsystem.h>

src/win32/helperthread.cpp

@@ -35,7 +35,6 @@
 **
 */
 
-#define _WIN32_WINNT	0x0400
 #include "helperthread.h"
 
 //==========================================================================

src/win32/i_cd.cpp

@@ -32,7 +32,6 @@
 **
 */
 
-#define _WIN32_WINNT	0x0400
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <mmsystem.h>

src/win32/i_crash.cpp

@@ -35,7 +35,6 @@
 // HEADER FILES ------------------------------------------------------------
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <richedit.h>
 #include <tlhelp32.h>

src/win32/i_dijoy.cpp

@@ -35,7 +35,6 @@
 
 #define WIN32_LEAN_AND_MEAN
 #define DIRECTINPUT_VERSION 0x800
-#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <dinput.h>
 #ifndef __GNUC__

src/win32/i_input.cpp

@@ -35,11 +35,6 @@
 // DI3 only supports up to 4 mouse buttons, and I want the joystick to
 // be read using DirectInput instead of winmm.
 
-#define DIRECTINPUT_VERSION 0x800
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)
-#define _WIN32_WINNT 0x0501			// Support the mouse wheel and session notification.
-#endif
-
 #define WIN32_LEAN_AND_MEAN
 #define __BYTEBOOL__
 #ifndef __GNUC__

src/win32/i_keyboard.cpp

@@ -35,7 +35,6 @@
 
 #define WIN32_LEAN_AND_MEAN
 #define DIRECTINPUT_VERSION 0x800
-#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <dinput.h>
 

src/win32/i_main.cpp

@@ -35,7 +35,6 @@
 // HEADER FILES ------------------------------------------------------------
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <mmsystem.h>
 #include <objbase.h>

src/win32/i_mouse.cpp

@@ -35,7 +35,6 @@
 
 #define WIN32_LEAN_AND_MEAN
 #define DIRECTINPUT_VERSION 0x800
-#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <dinput.h>
 

src/win32/i_rawps2.cpp

@@ -34,7 +34,6 @@
 // HEADER FILES ------------------------------------------------------------
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0501
 #include <windows.h>
 
 #include "i_input.h"

src/win32/i_specialpaths.cpp

@@ -33,7 +33,6 @@
 **
 */
 
-#define _WIN32_WINNT 0x0600
 #include <windows.h>
 #include <lmcons.h>
 #include <shlobj.h>

src/win32/i_xinput.cpp

@@ -36,7 +36,6 @@
 // HEADER FILES ------------------------------------------------------------
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include <xinput.h>
 #include <limits.h>

src/win32/st_start.cpp

@@ -35,7 +35,6 @@
 // HEADER FILES ------------------------------------------------------------
 
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0501	// required to get the MARQUEE defines
 #include <windows.h>
 #include <commctrl.h>
 #include "resource.h"