gbuild: set _WIN32_WINNT globally instead of WINVER

... and remove the definitions in makefiles, except in fpicker, which
defines a different value for the Vista file picker.

The WINVER value is derived automatically from _WIN32_WINNT by SDK
header sdkddkver.h.

Change-Id: I73358a9bf5d070f71821654cae2a29335a754a21

18 files changed, 2 insertions, 38 deletions

diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index da2ec7f4300c..72d1b8d3a5ca 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -70,10 +70,6 @@ $(eval $(call gb_Library_use_externals,cairocanvas,\
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Library_add_defs,cairocanvas,\
-	-D_WIN32_WINNT=0x0502 \
-))
-
 $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_win32_cairo \
 ))
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index dbe53b4b934f..b2ebe1bcb2b0 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -36,12 +36,6 @@ $(eval $(call gb_Library_use_system_win32_libs,ado,\
 	uuid \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_defs,ado,\
-	-D_WIN32_WINNT=0x0502 \
-))
-endif
-
 ifneq (,$(filter $(WINDOWS_SDK_VERSION),80 81))
 $(eval $(call gb_Library_add_defs,ado,\
 	-DNTDDI_VERSION=0x0601 \
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 47918976691b..cca6211b3a10 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -44,10 +44,6 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Library_add_defs,deploymentgui,\
-    -D_WIN32_WINNT=0x0502 \
-))
-
 $(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\
     ole32 \
 ))
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index e10110bab636..8878045469a2 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -17,10 +17,6 @@ $(eval $(call gb_Library_set_include,emboleobj,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_defs,emboleobj,\
-	-D_WIN32_WINNT=0x0502 \
-))
-
 $(eval $(call gb_Library_use_external,emboleobj,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,emboleobj))
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 6ff4223a832a..904baa49a5f3 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_set_include,emser,\
 
 $(eval $(call gb_Library_add_defs,emser,\
 	-UNOMINMAX \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_external,emser,boost_headers))
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 7bf936e311f9..cd3823b14322 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -24,10 +24,6 @@ $(eval $(call gb_Library_add_ldflags,oleautobridge,\
 	-LIBPATH:$(ATL_LIB) \
 ))
 
-$(eval $(call gb_Library_add_defs,oleautobridge,\
-	-D_WIN32_WINNT=0x0502 \
-))
-
 $(eval $(call gb_Library_use_external,oleautobridge,boost_headers))
 
 $(eval $(call gb_Library_use_libraries,oleautobridge,\
diff --git a/external/boost/StaticLibrary_boostthread.mk b/external/boost/StaticLibrary_boostthread.mk
index b9c165a42cd7..77b6ea12229f 100644
--- a/external/boost/StaticLibrary_boostthread.mk
+++ b/external/boost/StaticLibrary_boostthread.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost))
 
 $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostthread))
 
-$(eval $(call gb_StaticLibrary_add_defs,boostthread,\
-       -D_WIN32_WINNT=0x0502 \
-))
-
 # disable "auto link" "feature" on MSVC
 $(eval $(call gb_StaticLibrary_add_defs,boostthread,\
 	-DBOOST_ALL_NO_LIB \
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index 3f8947f71772..2df29fc8bcfe 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Library_use_custom_headers,sellangmsi,\
 
 $(eval $(call gb_Library_add_defs,sellangmsi,\
 	-U_DLL \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_add_cxxflags,sellangmsi,\
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index 00e3bf25d0ca..ae619e6dd47c 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Library_use_external,shlxtmsi,boost_headers))
 
 $(eval $(call gb_Library_add_defs,shlxtmsi,\
 	-U_DLL \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_add_cxxflags,shlxtmsi,\
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 490a89a13006..d7897ca7c081 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
 	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
-	-D_WIN32_WINNT=0x0502 \
 	-UNOMINMAX \
 ))
 
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index a690c413f3a4..26f85cefc6b0 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,ooofilt_x64,\
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 5073988ae93e..31f433aaaed5 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl,\
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index 64f9b997911a..cd189287f277 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl_x64,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 0c0b3e73908f..30e8f586f7cc 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl,\
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index 88fdfa837d08..a539b729909b 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl_x64,\
diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index 6c5851b1c794..553418d37b2f 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
 	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 0af62023a283..94704381ca23 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
 	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
-	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index cd71cff38401..5602a0379119 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -20,11 +20,12 @@ gb_Helper_LIBRARY_PATH_VAR := PATH
 
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
+# define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
 # currently _WIN32_IE is defined to a higher version than would be derived
 # in sdkddkver.h from _WIN32_WINNT=0x0502 but if _WIN32_WINNT >= 0x0600
 # the derived value is sufficient
 gb_OSDEFS := \
-	-DWINVER=0x0502 \
+	-D_WIN32_WINNT=0x0502 \
 	-D_WIN32_IE=0x0700 \
 	-DWIN32 \
 	-DWNT \