Add MinGW 64-bit
This commit is contained in:
parent
d3b0cef35f
commit
e975b35a93
5 changed files with 12 additions and 3 deletions
|
|
@ -10,6 +10,11 @@ jobs:
|
||||||
- CROSS_COMPILE=mingw32
|
- CROSS_COMPILE=mingw32
|
||||||
- CONTAINER=cross
|
- CONTAINER=cross
|
||||||
|
|
||||||
|
- os: linux
|
||||||
|
env:
|
||||||
|
- CROSS_COMPILE=mingw64
|
||||||
|
- CONTAINER=cross
|
||||||
|
|
||||||
- os: linux
|
- os: linux
|
||||||
arch: amd64
|
arch: amd64
|
||||||
dist: bionic
|
dist: bionic
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ cmake_dir="cmake-3.13.0-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}"
|
||||||
cmake_arc="${cmake_dir}.tar.gz"
|
cmake_arc="${cmake_dir}.tar.gz"
|
||||||
cmake_url="https://github.com/sfztools/cmake/releases/download/${TRAVIS_OS_NAME}/${cmake_arc}"
|
cmake_url="https://github.com/sfztools/cmake/releases/download/${TRAVIS_OS_NAME}/${cmake_arc}"
|
||||||
|
|
||||||
if [[ ${CROSS_COMPILE} == "mingw32" ]]; then
|
if [[ ${CROSS_COMPILE} == "mingw32" || ${CROSS_COMPILE} == "mingw64" ]]; then
|
||||||
buildenv bash -c "echo Hello from container" # ensure to start the container
|
buildenv bash -c "echo Hello from container" # ensure to start the container
|
||||||
docker cp "$container":/etc/pacman.conf pacman.conf
|
docker cp "$container":/etc/pacman.conf pacman.conf
|
||||||
cat >>pacman.conf <<EOF
|
cat >>pacman.conf <<EOF
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" || ${TRAVIS_OS_NAME} == "osx" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# buildenv runs a command in host machine or container, depending on build
|
# buildenv runs a command in host machine or container, depending on build
|
||||||
if [[ ${CROSS_COMPILE} == "mingw32" ]]; then
|
if [[ ${CROSS_COMPILE} == "mingw32" || ${CROSS_COMPILE} == "mingw64" ]]; then
|
||||||
buildenv() {
|
buildenv() {
|
||||||
setup_container archlinux
|
setup_container archlinux
|
||||||
docker exec -w "$(pwd)" -i -t "$container" "$@"
|
docker exec -w "$(pwd)" -i -t "$container" "$@"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
set -ex
|
set -ex
|
||||||
. .travis/environment.sh
|
. .travis/environment.sh
|
||||||
|
|
||||||
if [[ ${CROSS_COMPILE} == "mingw32" ]]; then
|
if [[ ${CROSS_COMPILE} == "mingw32" || ${CROSS_COMPILE} == "mingw64" ]]; then
|
||||||
buildenv pacman -Sqy --noconfirm
|
buildenv pacman -Sqy --noconfirm
|
||||||
buildenv pacman -Sq --noconfirm base-devel wget mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile
|
buildenv pacman -Sq --noconfirm base-devel wget mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile
|
||||||
buildenv i686-w64-mingw32-gcc -v && buildenv i686-w64-mingw32-g++ -v && buildenv i686-w64-mingw32-cmake --version
|
buildenv i686-w64-mingw32-gcc -v && buildenv i686-w64-mingw32-g++ -v && buildenv i686-w64-mingw32-cmake --version
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,10 @@ if [[ ${CROSS_COMPILE} == "mingw32" ]]; then
|
||||||
|
|
||||||
buildenv i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PWD}/${INSTALL_DIR} -DSFIZZ_JACK=OFF ..
|
buildenv i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PWD}/${INSTALL_DIR} -DSFIZZ_JACK=OFF ..
|
||||||
buildenv make -j
|
buildenv make -j
|
||||||
|
elif [[ ${CROSS_COMPILE} == "mingw64" ]]; then
|
||||||
|
|
||||||
|
buildenv x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PWD}/${INSTALL_DIR} -DSFIZZ_JACK=OFF ..
|
||||||
|
buildenv make -j
|
||||||
elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
|
elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
|
||||||
|
|
||||||
buildenv cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PWD}/${INSTALL_DIR} ..
|
buildenv cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PWD}/${INSTALL_DIR} ..
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue