configure.ac | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
New commits: commit 9e9c7d8b541448fd6022837633d50baa5bbfab69 Author: Michael Stahl <[email protected]> Date: Thu Mar 9 15:29:14 2017 +0100 configure: find the MSMs where MSVC 2017 Release hides them Change-Id: Id98d73eef46d63686745bf6cd3482b18c7223c3a diff --git a/configure.ac b/configure.ac index d1b813f..dc837c5 100644 --- a/configure.ac +++ b/configure.ac @@ -5336,6 +5336,12 @@ find_msms() my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/MergeModules/" if test -e "$my_msm_dir/$my_msm_file"; then msmdir=$my_msm_dir + else + # got everything in 14.10.15017 except the MSMS in 25008... huh? + my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/14.10.25008/MergeModules/" + if test -e "$my_msm_dir/$my_msm_file"; then + msmdir=$my_msm_dir + fi fi fi @@ -5347,6 +5353,7 @@ find_msms() AC_MSG_ERROR([not found]) else AC_MSG_WARN([not found]) + add_warning "MSM $my_msm_file not found" fi fi } commit 524e36f8071530c4706304a305402944a4a32dfa Author: Michael Stahl <[email protected]> Date: Thu Mar 9 14:59:05 2017 +0100 configure: find MSVC 2017 64-bit compiler Change-Id: I7ae99ebc693291709edc6df233f54dfe00d74e9e diff --git a/configure.ac b/configure.ac index c232649..d1b813f 100644 --- a/configure.ac +++ b/configure.ac @@ -3681,7 +3681,6 @@ if test "$_os" = "WINNT"; then LINK_X64_BINARY= if test "$BITNESS_OVERRIDE" = ""; then - # TODO(davido): This is probably broken for MSVC 15.0 AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions]) if test -f "$VC_PRODUCT_DIR/atlmfc/lib/amd64/atls.lib"; then # Prefer native x64 compiler to cross-compiler, in case we are running @@ -3695,6 +3694,13 @@ if test "$_os" = "WINNT"; then CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe" fi + elif test -f "$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/atlmfc/lib/x64/atls.lib"; then + # nobody uses 32-bit OS to build, just pick the 64-bit compiler + if "$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe" -? </dev/null >/dev/null 2>&1; then + BUILD_X64=TRUE + CXX_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe" + LINK_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/link.exe" + fi fi if test "$BUILD_X64" = TRUE; then AC_MSG_RESULT([found]) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
