configure.in | 3 +++
python/makefile.mk | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 20b5afffafc71d2ad2fef80cd4239d6865625649
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date: Wed Jun 12 06:46:36 2013 +0000
122500: enable Windows build having only the corresponding SDK SP1 installed
Name of this Windows SDK is "Microsoft Windows SDK for Windows 7 and .NET
Framework 3.5 SP1"
Download link of this Windows SDK is
http://www.microsoft.com/en-us/download/details.aspx?id=3138
diff --git a/configure.in b/configure.in
index 5181864..c3000be 100644
--- a/configure.in
+++ b/configure.in
@@ -5679,6 +5679,9 @@ dnl Check if this is the right SDK.
elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
WINDOWS_VISTA_PSDK=TRUE
+ elif echo $PSDK_HOME | grep "v7.0" >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT([Found Windows SDK 7.0 ($PSDK_HOME)])
+ WINDOWS_VISTA_PSDK=TRUE
else
AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
fi
diff --git a/python/makefile.mk b/python/makefile.mk
index 593b10f..3bf7e1a 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -113,11 +113,7 @@ BUILD_DIR=PCbuild
# Build python executable and then runs a minimal script. Running the minimal
script
# ensures that certain *.pyc files are generated which would otherwise be
created on
# solver during registration in insetoo_native
-.IF "$(SYSBASE)" != ""
BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln
"Release|Win32"
-.ELSE
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32"
-.ENDIF # "$(SYSBASE)" != ""
.ENDIF
.ENDIF
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
