git:// links no longer work, refer to the https:// one.

[wiki] / examples / cross-compiling-64-bit-windows-binary.mdwn

diff --git a/examples/cross-compiling-64-bit-windows-binary.mdwn b/examples/cross-compiling-64-bit-windows-binary.mdwn
index be17ae2..bb09af1 100644 (file)
--- a/examples/cross-compiling-64-bit-windows-binary.mdwn
+++ b/examples/cross-compiling-64-bit-windows-binary.mdwn
@@ -21,23 +21,16 @@ The idea is simple:
 
 There are only a few packages that need to be installed as root to get started:
 
-       sudo apt-get install gcc-mingw32 mingw64 git-core wget
+       sudo apt-get install mingw-w64 git-core wget quilt
        sudo apt-get build-dep tinc
 
 Other Linux distributions may also have 64-bit MinGW packages, use their respective
 package management tools to install them.  Debian installs the cross-compiler
-in `/usr/amd64-mingw32msvc/`. Other distributions might install it in another
+in `/usr/x86_64-w64-mingw32/`. Other distributions might install it in another
 directory however. Check in which directory
-it is installed, and replace all occurences of `amd64-mingw32msvc` in this
+it is installed, and replace all occurences of `x86_64-w64-mingw32` in this
 example with the correct name from your distribution.
 
-At the time of writing, the gcc-mingw32 package contains the 64-bit compiler as
-well, in the future this might be put into its own package. Also, a header file
-is missing in the amd64-mingw32msvc include directory, a workaround is to
-create a symlink to the otherwise identical 32-bit version of that header file:
-
-       ln -s ../../i586-mingw32msvc/include/getopt.h /usr/amd64-mingw32msvc/include/getopt.h
-
 ### Setting up the build directory and getting the sources
 
 We will create a directory called `mingw64/` in the home directory.  We use
@@ -46,10 +39,8 @@ apt-get and wget to get the required libraries necessary for tinc, and use
 
        mkdir $HOME/mingw64
        cd $HOME/mingw64
-       apt-get source liblzo2-dev zlib1g-dev
-       wget http://www.openssl.org/source/openssl-1.0.0.tar.gz
-       tar xzf openssl-1.0.0.tar.gz
-       git clone git://tinc-vpn.org/tinc
+       apt-get source liblzo2-dev zlib1g-dev libssl-dev
+       git clone https://tinc-vpn.org/git/tinc
 
 ### Making cross-compilation easy
 
@@ -58,15 +49,17 @@ up the necessary environment variables so configure scripts and Makefiles will
 use the 64-bit MinGW version of GCC and binutils:
 
        mkdir $HOME/bin
-       cat >$HOME/bin/mingw64 << EOF
+       cat >$HOME/bin/mingw64 << 'EOF'
        #!/bin/sh
-       export CC=amd64-mingw32msvc-gcc
-       export CXX=amd64-mingw32msvc-g++
-       export CPP=amd64-mingw32msvc-cpp
-       export RANLIB=amd64-mingw32msvc-ranlib
-       export PATH="/usr/amd64-mingw32msvc/bin:$PATH"
+       PREFIX=x86_64-w64-mingw32
+       export CC=$PREFIX-gcc
+       export CXX=$PREFIX-g++
+       export CPP=$PREFIX-cpp
+       export RANLIB=$PREFIX-ranlib
+       export PATH="/usr/x86_64-w64-mingw32/bin:$PATH"
        exec "$@"
        EOF
+       chmod u+x $HOME/bin/mingw64
 
 If `$HOME/bin` is not already part of your `$PATH`, you need to add it:
 
@@ -84,8 +77,8 @@ time it is needed.
 
 Cross-compiling LZO is easy:
 
-       cd $HOME/mingw64/lzo2-2.03
-       ./configure --host=amd64-mingw32msvc
+       cd $HOME/mingw64/lzo2-2.08
+       ./configure --host=x86_64-w64-mingw32
        make
        DESTDIR=$HOME/mingw64 make install
 
@@ -97,20 +90,19 @@ create a symlink for the missing getopt.h file as mentioned above.
 Cross-compiling Zlib is also easy, but a plain `make` failed to compile the
 tests, so we only build the static library here:
 
-       cd $HOME/mingw64/zlib-1.2.3.3.dfsg
-       mingw64 ./configure
-       mingw64 make libz.a
+       cd $HOME/mingw64/zlib-1.2.8.dfsg
+       mingw64 ./configure --static
+       mingw64 make
        DESTDIR=$HOME/mingw64 mingw64 make install
 
-### Compiling OpenSSL
+### Compiling LibreSSL
 
-Although older versions will not compile, OpenSSL 1.0.0 is easy.
-Do not use the `-j` option when compiling OpenSSL, it will break.
+Tinc can use either OpenSSL or LibreSSL. The latter is recommended.
 
-       cd $HOME/mingw64/openssl-1.0.0
-       mingw64 ./Configure --openssldir=$HOME/mingw64/usr/local mingw64
-       mingw64 make
-       mingw64 make install
+       cd $HOME/mingw/libressl-2.3.3
+       CC=x86_64-w64-mingw32-gcc ./configure --host=x86_64-w64-mingw32
+       make
+       DESTDIR=$HOME/mingw make install
 
 ### Compiling tinc
 
@@ -121,5 +113,5 @@ this is not necessary.
 
        cd $HOME/mingw64/tinc
        autoreconf -fsi
-       ./configure --host=amd64-mingw32msvc --with-openssl=$HOME/mingw64/usr/local
+       ./configure --host=x86_64-w64-mingw32 --with-zlib=$HOME/mingw64/usr/local
        make