diff options
| author | Mark Williams <mark@dimm.de> | 2014-12-17 21:52:21 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2014-12-17 22:22:23 +0000 |
| commit | 7aaadcfce963079aafd52988bd834f50c2d6a4ec (patch) | |
| tree | 6bbb86d3f08955bdf5a68d6961fa8f623540190f | |
| parent | a4681be5347fe24867b4f603dc57942c3306227b (diff) | |
configure.ac: make it work with VisualStudio Express and 64 bit compile
Because VS Express has no native 64Bit compiler but a 64 Bit cross-
compiler. The path resolution to detect binaries and libraries was
not suitable for the cross compiler. The added resolution is only
effective if no native compiler was found.
Change-Id: I8066cb04f94eb4bfd0c57b35e5e39883c51ee046
Reviewed-on: https://gerrit.libreoffice.org/13515
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 2b1a0a2c4d01..c7cd156f6b61 100644 --- a/configure.ac +++ b/configure.ac @@ -3438,7 +3438,11 @@ if test "$_os" = "WINNT"; then if test -f "$vctest/bin/amd64/cl.exe"; then VC_PRODUCT_DIR=$vctest else - AC_MSG_ERROR([No compiler (cl.exe) in $vctest/bin/amd64/cl.exe]) + if test -f "$vctest/bin/x86_amd64/cl.exe" -a "$vcexpress" = "Express"; then + VC_PRODUCT_DIR=$vctest + else + AC_MSG_ERROR([No compiler (cl.exe) in $vctest/bin/amd64/cl.exe or $vctest/bin/x86_amd64/cl.exe]) + fi fi fi @@ -3471,7 +3475,11 @@ if test "$_os" = "WINNT"; then MSPDB_PATH="$VC_PRODUCT_DIR/../Common7/IDE" fi else - MSPDB_PATH="$VC_PRODUCT_DIR/bin/amd64" + if test "$vcexpress" = "Express"; then + MSPDB_PATH="$VC_PRODUCT_DIR/bin" + else + MSPDB_PATH="$VC_PRODUCT_DIR/bin/amd64" + fi fi mspdbnum=$vcnum @@ -3499,8 +3507,14 @@ if test "$_os" = "WINNT"; then CC="$VC_PRODUCT_DIR/bin/cl.exe" fi else - if test -f "$VC_PRODUCT_DIR/bin/amd64/cl.exe"; then - CC="$VC_PRODUCT_DIR/bin/amd64/cl.exe" + if test "$vcexpress" = "Express"; then + if test -f "$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe"; then + CC="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" + fi + else + if test -f "$VC_PRODUCT_DIR/bin/amd64/cl.exe"; then + CC="$VC_PRODUCT_DIR/bin/amd64/cl.exe" + fi fi fi @@ -9712,8 +9726,13 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then assembler=ml.exe assembler_bin=bin else - assembler=ml64.exe - assembler_bin=bin/amd64 + if test "$vcexpress" = "Express"; then + assembler=ml64.exe + assembler_bin=bin/x86_amd64 + else + assembler=ml64.exe + assembler_bin=bin/amd64 + fi fi AC_MSG_CHECKING([$VC_PRODUCT_DIR/$assembler_bin/$assembler]) @@ -12712,8 +12731,13 @@ else pathmunge "$MSBUILD_PATH" "before" fi if test "$BITNESS_OVERRIDE" = 64; then - pathmunge "$COMPATH/bin/amd64" "before" - pathmunge "$WINDOWS_SDK_HOME/bin/x64" "before" + if test "$vcexpress" = "Express"; then + pathmunge "$COMPATH/bin/x86_amd64" "before" + pathmunge "$WINDOWS_SDK_HOME/bin/x64" "before" + else + pathmunge "$COMPATH/bin/amd64" "before" + pathmunge "$WINDOWS_SDK_HOME/bin/x64" "before" + fi else pathmunge "$COMPATH/bin" "before" pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before" |