From 524e36f8071530c4706304a305402944a4a32dfa Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 9 Mar 2017 14:59:05 +0100 Subject: configure: find MSVC 2017 64-bit compiler Change-Id: I7ae99ebc693291709edc6df233f54dfe00d74e9e --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c232649b7169..d1b813fbafe5 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 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]) -- cgit b/libreoffice-6-1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/unoidl
AgeCommit message (Expand)Author
2019-04-27tdf#42949 Add filter file to unoidl/Gabor Kelemen
2019-02-28loplugin:includeformStephan Bergmann
2019-02-13tdf#42949 Fix IWYU warnings in unoidl/Gabor Kelemen
2018-12-08Remove obsolete SAL_FALLTHROUGH completelyStephan Bergmann
2018-11-08loplugin:collapseif in tools..xmloffNoel Grandin
2018-10-24remove more rtl::OUString and OString prefixesNoel Grandin
2018-10-17Simplify containers iterations in unodevtools, unoidlArkadiy Illarionov
2018-10-17clang-tidy readability-redundant-smartptr-getNoel Grandin
2018-09-26loplugin:constfields in unoidlNoel Grandin
2018-09-17New loplugin:externalStephan Bergmann
2018-09-08clang-tidy bugprone-unused-return-valueNoel Grandin
2018-08-29Replace find_if with proper quantifier algorithmsArkadiy Illarionov
2018-08-02Add missing sal/log.hxx headersGabor Kelemen
2018-07-27new loplugin:stringloop, and applied in variousNoel Grandin
2018-07-27Related: rhbz#1602589 add comments to coverity annotationsCaolán McNamara
2018-07-10tdf#42949 Fix IWYU warnings in include/osl/*hxxGabor Kelemen
2018-03-16Typo in error messageStephan Bergmann
2017-10-24loplugin:includeform: unoidl (macOS)Stephan Bergmann
2017-10-23loplugin:includeform: unoidlStephan Bergmann
2017-10-23Fix typosAndrea Gelmini
2017-10-19loplugin:includeform: manual changes to unoidl/source/sourceprovider-parser.yStephan Bergmann
2017-08-11convert std::map::insert to std::map::emplace IINoel Grandin
2017-07-17loplugin:constparams in comphelper,unoidlNoel Grandin
2017-06-16Still more tests to suppressStephan Bergmann
2017-06-02Improved loplugin:redundantcast static_cast handling: unoidlStephan Bergmann
2017-04-15Fix typosAndrea Gelmini
2017-04-05loplugin:redundantcast find c-style bool castsNoel Grandin
2017-02-10test coverity sanitizing in-source modellingCaolán McNamara
2017-02-06loplugin:nullptrJochen Nitschke
2016-12-21some more fallthrough warning quieteningCaolán McNamara
2016-12-21quieten the clang fallthrough warningsCaolán McNamara
2016-12-20bootstrap building with --disable-dynloading on standard linuxCaolán McNamara
2016-10-03Fix typosAndrea Gelmini
2016-09-13loplugin:override: No more need for the "MSVC dtor override" workaroundStephan Bergmann
2016-08-30loplugin:stringconstant: adapt to improved OUStringLiteral1 (unoidl)Stephan Bergmann
2016-07-27loplugin:countusersofdefaultparams in tools..xmlsecurityNoel Grandin
2016-07-07loplugin:passstuffbyref also for {css::uno,rtl}::ReferenceStephan Bergmann
2016-05-12Massage code to avoid warningsStephan Bergmann
2016-05-10Replace fallthrough comments with new SAL_FALLTHROUGH macroStephan Bergmann
2016-04-26loplugin:nullptrStephan Bergmann
2016-03-17loplugin:constantparam in registryNoel Grandin
2016-02-06Fix prev. commitStephan Bergmann
2016-02-06Clean up for loops in unoidlStephan Bergmann
2016-02-04Add --ignore-unpublished to unoidl-checkStephan Bergmann
2015-12-14Use emplace_backStephan Bergmann