Author: orw
Date: Wed Jun 12 06:46:36 2013
New Revision: 1492076
URL: http://svn.apache.org/r1492076
Log:
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
Modified:
openoffice/trunk/ext_libraries/coinmp/makefile.mk
openoffice/trunk/main/configure.in
openoffice/trunk/main/python/makefile.mk
Modified: openoffice/trunk/ext_libraries/coinmp/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/makefile.mk?rev=1492076&r1=1492075&r2=1492076&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/coinmp/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/coinmp/makefile.mk Wed Jun 12 06:46:36 2013
@@ -48,7 +48,7 @@ TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65be
PATCH_FILES=coinmp-1.6.0.patch coinmp-1.6.0-clang.patch
.IF "$(COM)"=="MSC"
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe
CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv
CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
.ELSE
CONFIGURE_ACTION=./configure
#CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC)
$(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' CFLAGS='$(ARCH_FLAGS) -Wc,-arch
-Wc,i386' CPPFLAGS='$(ARCH_FLAGS)' LDFLAGS='$(ARCH_FLAGS)'
compiler_flags='$(ARCH_FLAGS)'
Modified: openoffice/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1492076&r1=1492075&r2=1492076&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Wed Jun 12 06:46:36 2013
@@ -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
Modified: openoffice/trunk/main/python/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/makefile.mk?rev=1492076&r1=1492075&r2=1492076&view=diff
==============================================================================
--- openoffice/trunk/main/python/makefile.mk (original)
+++ openoffice/trunk/main/python/makefile.mk Wed Jun 12 06:46:36 2013
@@ -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
