From 677e02f8902d46b288a38d81af02f4165d1bb70e Mon Sep 17 00:00:00 2001
From: Faerbit <faerbit@gmail.com>
Date: Wed, 26 Nov 2014 00:56:16 +0100
Subject: [PATCH] Another try at cross compilation on circle.

---
 build.sh   | 2 +-
 circle.yml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 0aacd53..00d9878 100755
--- a/build.sh
+++ b/build.sh
@@ -12,7 +12,7 @@ cmake="cmake"
 
 if [[ $1 == "windows" ]]
 then
-    cmake="cmake -DCMAKE_SYSTEM_NAME='Windows' -DCMAKE_FIND_ROOT_PATH='/usr/x86_64-w64-mingw32' -DCMAKE_CXX_COMPILER='x86_64-w64-mingw32-g++' -DCMAKE_C_COMPILER='x86_64-w64-mingw32-gcc'"
+    cmake="cmake -DCMAKE_SYSTEM_NAME='Windows' -DCMAKE_FIND_ROOT_PATH='/usr/x86_64-w64-mingw32:~/mxe/usr/bin' -DCMAKE_CXX_COMPILER='x86_64-w64-mingw32-g++' -DCMAKE_C_COMPILER='x86_64-w64-mingw32-gcc'"
 fi
 
 currentDir=$(pwd)
diff --git a/circle.yml b/circle.yml
index 82d06b0..f91c7e8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,12 +6,10 @@ dependencies:
     override:
         - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
         - sudo add-apt-repository ppa:kalakris/cmake -y
-        - sudo add-apt-repository ppa:tkelman/mingw-backport -y
         - sudo apt-get -qq update
         - sudo apt-get -qq install cmake
         - sudo apt-get install -qq g++-4.8
         - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
-        - sudo apt-get install -qq gcc-mingw-w64
         - sudo apt-get install -qq xorg-dev
         - sudo apt-get install ninja-build
         # Install megacmd
@@ -19,6 +17,9 @@ dependencies:
         - cd megacmd; make
         - sudo cp megacmd/megacmd /usr/local/bin
         - echo $megacmd > ~/.megacmd.json
+        # Install mingw-w64
+        - git clone https://github.com/mxe/mxe.git
+        - cd mxe; make MXE_TARGETS="x86_64-w64-mingw32" -j$(($(nproc)+1))
 
 database:
     override: