summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-03-04 13:51:36 +0100
committerMichael Stahl <mstahl@redhat.com>2015-03-05 15:36:46 +0100
commitd8dd6db19a9a37072a0dfbfc94f3690750ebd219 (patch)
tree4c8a7f92601646e9f3ecdbd977ca3d03adb4f85b /shell
parentfe045dca6124c9627c1cfa9dac4072ae75292910 (diff)
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
Diffstat (limited to 'shell')
-rw-r--r--shell/Library_ooofilt.mk1
-rw-r--r--shell/Library_ooofilt_x64.mk1
-rw-r--r--shell/Library_propertyhdl.mk1
-rw-r--r--shell/Library_propertyhdl_x64.mk1
-rw-r--r--shell/Library_shlxthdl.mk1
-rw-r--r--shell/Library_shlxthdl_x64.mk1
-rw-r--r--shell/StaticLibrary_shlxthandler_common.mk1
-rw-r--r--shell/StaticLibrary_shlxthandler_common_x64.mk1
8 files changed, 0 insertions, 8 deletions
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,\