Another try at cross compilation on circle.

This commit is contained in:
Faerbit 2014-11-26 00:56:16 +01:00
parent c6c9c83eb7
commit cdfc6fa94a
2 changed files with 4 additions and 3 deletions

View File

@ -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)

View File

@ -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: