Allow building with w64-mingw32
authorWerner Koch <wk@gnupg.org>
Mon, 5 Nov 2012 18:21:51 +0000 (19:21 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 20 Mar 2013 15:00:01 +0000 (16:00 +0100)
* autogen.sh <--build-w32>: Support the w64-mingw32 toolchain.  Also
prepare for 64 bit building.
--

NB: Despite of this change in autogen.sh, there is no support for 64
bit Windows yet.  The change has only be done to eventually allow to
work on a W64 version.

autogen.sh

index a0bbd6b..841c2c2 100755 (executable)
@@ -102,12 +102,12 @@ if [ "$myhost" = "w32" ]; then
         64)
           w32root="$w64root"
           [ -z "$w32root" ] && w32root="$HOME/w64root"
-          toolprefixes="amd64-mingw32msvc"
+          toolprefixes="$amd64_toolprefixes amd64-mingw32msvc"
           ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
-          toolprefixes="i586-mingw32msvc i386-mingw32msvc"
-          toolprefixes="i586-mingw32msvc i386-mingw32msvc i686-w64-mingw32"
+          toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
+          toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
           ;;
     esac
     echo "Using $w32root as standard install directory" >&2