diff options
| -rw-r--r-- | shell/Library_ooofilt.mk | 1 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 1 | ||||
| -rw-r--r-- | shell/Library_propertyhdl.mk | 1 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 1 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 1 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 1 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common.mk | 1 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common_x64.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 3 |
9 files changed, 3 insertions, 8 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index f997eeadeb4c..490a89a13006 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ -UNOMINMAX \ )) diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 8f994dc2b9ca..a690c413f3a4 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ )) diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 6ea684fcb962..5073988ae93e 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 29f389911516..64f9b997911a 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ )) diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index f79dc85f1249..0c0b3e73908f 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ )) diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index dfd694d93efb..88fdfa837d08 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ )) diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk index e6a47ac67db4..6c5851b1c794 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ )) diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 3456c0bca1bb..0af62023a283 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_IE=0x700 \ -D_WIN32_WINNT=0x0502 \ )) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index a7ab73d46ccb..cd71cff38401 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -20,6 +20,9 @@ gb_Helper_LIBRARY_PATH_VAR := PATH gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX +# 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_IE=0x0700 \ |