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 /embeddedobj | |
| 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 'embeddedobj')
| -rw-r--r-- | embeddedobj/Library_emboleobj.mk | 4 | ||||
| -rw-r--r-- | embeddedobj/source/msole/platform.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 3d415f40f2d2..96f03ee16ca5 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -17,6 +17,10 @@ $(eval $(call gb_Library_set_include,emboleobj,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_add_defs,emboleobj,\ + -D_WIN32_WINNT=0x0502 \ +)) + $(eval $(call gb_Library_use_external,emboleobj,boost_headers)) $(eval $(call gb_Library_use_sdk_api,emboleobj)) diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h index 2a8c1172b3c0..56c21a21d8cc 100644 --- a/embeddedobj/source/msole/platform.h +++ b/embeddedobj/source/msole/platform.h @@ -21,9 +21,6 @@ #define _PLATFORM_H_ #define STRICT -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 -#endif #define _ATL_APARTMENT_THREADED #if defined _MSC_VER |