summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-28 15:03:17 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-10-28 15:16:20 +0100
commita346904323fd3f38bffa2cc07d7f581caab1b434 (patch)
treed92eefab19329ecf1e8d36b6ba16a74be370c458 /shell
parente22242fddb73f5eadb11f340c314bbc4a6cfe361 (diff)
shell: just define _WIN32_IE and drop the undef
Because the compiler warns either way. cl : Command line warning D9025 : overriding ´/D_WIN32_IE=0x0500´ with ´/U_WIN32_IE´ After this change the message what's overwritten gets more clear to the reader. Change-Id: I773e7499537aff879f857b9b50ec8afc4005130b
Diffstat (limited to 'shell')
-rw-r--r--shell/Library_ooofilt.mk2
-rw-r--r--shell/Library_ooofilt_x64.mk2
-rw-r--r--shell/Library_propertyhdl.mk2
-rw-r--r--shell/Library_propertyhdl_x64.mk2
-rw-r--r--shell/Library_shlxthdl.mk2
-rw-r--r--shell/Library_shlxthdl_x64.mk2
-rw-r--r--shell/StaticLibrary_shlxthandler_common.mk2
-rw-r--r--shell/StaticLibrary_shlxthandler_common_x64.mk2
8 files changed, 0 insertions, 16 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 88f1783b9e0b..d225deb5dcbe 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -22,9 +22,7 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
-D_UNICODE \
))
$(eval $(call gb_Library_add_defs,ooofilt,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
-UNOMINMAX \
))
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 51b201537743..cf12f73c03cf 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,ooofilt_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index d421ea955bd6..36bc9f74a956 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -23,9 +23,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,propertyhdl,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index b3104b191129..72a9b5136b47 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,propertyhdl_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 5d0fad6380da..a19de73b4f13 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -23,9 +23,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,shlxthdl,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index d3cb6b8b5634..595263f06920 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
-UNOMINMAX \
))
$(eval $(call gb_Library_add_defs,shlxthdl_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index ff75ba2f44b0..d2c9c8df5b22 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -22,9 +22,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
-D_UNICODE \
))
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index b156ccbdcbfc..17d601424310 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -28,9 +28,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
-D_UNICODE \
))
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
- -U_WIN32_IE \
-D_WIN32_IE=0x501 \
- -U_WIN32_WINNT \
-D_WIN32_WINNT=0x0501 \
))