diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-11-06 11:23:15 +0100 |
---|---|---|
committer | Thorsten Behrens <thb@documentfoundation.org> | 2013-11-20 07:15:16 -0600 |
commit | f01580ce9c5f898c1fdb85e302a158f1a31205db (patch) | |
tree | a49f1c99391904d8b4f96e6ff1a7160ce82d4461 /solenv/gbuild/platform | |
parent | d0c5f4522f8aa063b3e7c034db079d74b7f0b3fa (diff) |
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 <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
Diffstat (limited to 'solenv/gbuild/platform')
-rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/platform/mingw.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/platform/windows.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index c76d65a97467..f002d51f8e71 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -57,7 +57,7 @@ gb_COMPILERDEFS += \ endif gb_RCDEFS := \ - -DWINVER=0x0400 \ + -DWINVER=0x0502 \ -DWIN32 \ gb_RCFLAGS := diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 53533e7f2f8f..fe0422336b93 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -26,7 +26,7 @@ gb_COMPILERDEFS += \ -D_FORCENAMELESSUNION \ gb_RCDEFS := \ - -DWINVER=0x0400 \ + -DWINVER=0x0502 \ -DWIN32 \ gb_RCFLAGS := diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index bc2dad14ad06..02428cae3b17 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -18,8 +18,8 @@ gb_Helper_LIBRARY_PATH_VAR := PATH gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX gb_OSDEFS := \ - -DWINVER=0x0500 \ - -D_WIN32_IE=0x0500 \ + -DWINVER=0x0502 \ + -D_WIN32_IE=0x0700 \ -DWIN32 \ -DWNT \ -DNOMINMAX \ |