summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-07-10 14:20:18 +1000
committerThorsten Behrens <thorsten.behrens@allotropia.de>2021-02-03 12:17:47 +0100
commitfa6dc75b49b9bd982f92f26415c52b10cf71f39b (patch)
tree8f9edcede4d6a796906976cf3a37ecc8942343ff
parenta2aa89cbefebd63afb6228c87524d2d767bc5f47 (diff)
We don't support building with Windows SDK 7.1A
... it's already impossible with 6.2; and was only needed prior to 6.0, where Windows XP support was needed. Change-Id: Ia462f0b6566ae35bd68545d2d34d2987ee7907b9 Reviewed-on: https://gerrit.libreoffice.org/75334 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Conflicts: configure.ac
-rw-r--r--configure.ac19
1 files changed, 4 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 373cd216d423..236c50527d40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2035,7 +2035,7 @@ AC_ARG_WITH(visual-studio,
,)
AC_ARG_WITH(windows-sdk,
- AS_HELP_STRING([--with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)/10>],
+ AS_HELP_STRING([--with-windows-sdk=<8.0(A)/8.1(A)/10>],
[Specify which Windows SDK, or "Windows Kit", version to use
in case the one that came with the selected Visual Studio
is not what you want for some reason. Note that not all compiler/SDK
@@ -3541,11 +3541,11 @@ if test "$_os" = "WINNT"; then
case $vcnum in
140)
COMEX=19
- WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0 7.1A"
+ WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
;;
150)
COMEX=19
- WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0 7.1A"
+ WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
;;
esac
@@ -5200,20 +5200,12 @@ find_dotnetsdk46()
find_winsdk_version()
{
- # Args: $1 : SDK version as in "6.0A", "7.0" etc
+ # Args: $1 : SDK version as in "8.0", "8.1A" etc
# Return values: $winsdktest, $winsdkbinsubdir, $winsdklibsubdir
unset winsdktest winsdkbinsubdir winsdklibsubdir
case "$1" in
- 7.*)
- reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v${1}/InstallationFolder"
- if test -n "$regvalue"; then
- winsdktest=$regvalue
- winsdklibsubdir=.
- return
- fi
- ;;
8.0|8.0A)
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot"
if test -n "$regvalue"; then
@@ -5411,9 +5403,6 @@ the Windows SDK are installed.])
if test -z "$WINDOWS_SDK_HOME"; then
AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway!?])
- elif echo $WINDOWS_SDK_HOME | grep "v7.1" >/dev/null 2>/dev/null; then
- WINDOWS_SDK_VERSION=70
- AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)])
elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then
WINDOWS_SDK_VERSION=80
AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)])