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

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 \
 ))

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 \

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 \
 ))

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))

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))

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,\

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 \

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,\

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,\

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 \
 ))
 

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,\

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,\

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,\

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,\

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,\

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,\

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,\

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 \