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 /external | |
| 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 'external')
| -rw-r--r-- | external/libmariadb/mariadb-trunk-101.patch | 2 | ||||
| -rw-r--r-- | external/nss/nss-3.13.3-build.patch.3 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/libmariadb/mariadb-trunk-101.patch b/external/libmariadb/mariadb-trunk-101.patch index a5a74a519b6b..228bddc04776 100644 --- a/external/libmariadb/mariadb-trunk-101.patch +++ b/external/libmariadb/mariadb-trunk-101.patch @@ -240752,7 +240752,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/win-iconv/win_iconv +
+/* for WC_NO_BEST_FIT_CHARS */
+#ifndef WINVER
-+# define WINVER 0x0500
++# define WINVER 0x0502
+#endif
+
+#define STRICT
diff --git a/external/nss/nss-3.13.3-build.patch.3 b/external/nss/nss-3.13.3-build.patch.3 index 7412c288ab77..383b9384a9c8 100644 --- a/external/nss/nss-3.13.3-build.patch.3 +++ b/external/nss/nss-3.13.3-build.patch.3 @@ -16,7 +16,7 @@ # the dllimport attribute that a pointer to a function marked as # dllimport cannot be used as as a constant address. - OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -+ OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0501 -U__MMX__ -U__SSE__ -U__SSE2__ ++ OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0700 -U__MMX__ -U__SSE__ -U__SSE2__ _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY) DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB)) ifdef BUILD_OPT |