From f01580ce9c5f898c1fdb85e302a158f1a31205db Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 6 Nov 2013 11:23:15 +0100 Subject: Windows: Require at least Windows XP SP2 * Windows XP SP2 is 0x0502, see http://msdn.microsoft.com/en-us/library/aa383745.aspx * If a module changes the Windows SDK version setting, this is done module wide now. So the overall behavior is as before. This seems to be the best compromise for now. * We need at least SP2 because of the bluetooth stuff used in sd/source/ui/remotecontrol. * Now, we require at least Internet Explorer 7.0. IE6 has been outdated for a long time. * Leave StdAfx.h file definitions, as those are Microsoft project specific precompiled header files. * All local definitions of WINVER are removed, because the global WINVER setting makes them obsolete now. To the relation of the three macros: Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION automatically to the same value as _WIN32_WINNT. WINVER and NTDDI_VERSION can be set idenpendently each for itself. Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb Reviewed-on: https://gerrit.libreoffice.org/6496 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- desktop/Library_deploymentgui.mk | 4 ++++ desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'desktop') diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 1fb9e33f3711..2a13cc6ce3a1 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -42,6 +42,10 @@ $(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/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 8b2cd3369248..706c48538160 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined WNT -#define _WIN32_WINNT 0x0500 -#endif - #include "sal/config.h" #include -- cgit