X-Git-Url: https://tinc-vpn.org/git/browse?p=wiki;a=blobdiff_plain;f=examples%2Fcross-compiling-64-bit-windows-binary.mdwn;h=a16acd6cac887fb686349e3f04cb82a6fe7f5693;hp=3e166f363cecff250f0b4d1d3d776d31c9f8b776;hb=HEAD;hpb=98207c4c23c539108def07110fbdebbb12e05699

diff --git a/examples/cross-compiling-64-bit-windows-binary.mdwn b/examples/cross-compiling-64-bit-windows-binary.mdwn
index 3e166f3..bb09af1 100644
--- a/examples/cross-compiling-64-bit-windows-binary.mdwn
+++ b/examples/cross-compiling-64-bit-windows-binary.mdwn
@@ -21,35 +21,26 @@ 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 build-dep tinc
+	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
 apt-get and wget to get the required libraries necessary for tinc, and use
 `git` to get the latest development version of tinc.
 
->     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
+	mkdir $HOME/mingw64
+	cd $HOME/mingw64
+	apt-get source liblzo2-dev zlib1g-dev libssl-dev
+	git clone https://tinc-vpn.org/git/tinc
 
 ### Making cross-compilation easy
 
@@ -57,20 +48,22 @@ To make cross-compiling easy, we create a script called `mingw64` that will set
 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
->     #!/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"
->     exec "$@"
->     EOF
+	mkdir $HOME/bin
+	cat >$HOME/bin/mingw64 << 'EOF'
+	#!/bin/sh
+	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:
 
->     export PATH="$HOME/bin:$PATH"
+	export PATH="$HOME/bin:$PATH"
 
 We use this script to call `./configure` and `make` with the right environment
 variables, but only when the `./configure` script doesn't support cross-compilation itself.
@@ -84,10 +77,10 @@ time it is needed.
 
 Cross-compiling LZO is easy:
 
->     cd $HOME/mingw64/lzo2-2.03
->     ./configure --host=amd64-mingw32msvc
->     make
->     DESTDIR=$HOME/mingw64 make install
+	cd $HOME/mingw64/lzo2-2.08
+	./configure --host=x86_64-w64-mingw32
+	make
+	DESTDIR=$HOME/mingw64 make install
 
 If it fails with a message about not passing the "ACC" test,
 create a symlink for the missing getopt.h file as mentioned above.
@@ -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
->     DESTDIR=$HOME/mingw64 mingw64 make install
+	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
 
@@ -119,7 +111,7 @@ tinc.  Since we use a clone of the git repository here, we need to run
 `autoreconf` first. If you want to cross-compile tinc from a released tarball,
 this is not necessary.
 
->     cd $HOME/mingw64/tinc
->     autoreconf -fsi
->     ./configure --host=amd64-mingw32msvc --with-openssl=$HOME/mingw64/usr/local
->     make
+	cd $HOME/mingw64/tinc
+	autoreconf -fsi
+	./configure --host=x86_64-w64-mingw32 --with-zlib=$HOME/mingw64/usr/local
+	make