Skip to content

Commit 7d1d2af

Browse files
committed
Build with new MinGW repo
1 parent 2995eed commit 7d1d2af

2 files changed

Lines changed: 18 additions & 4 deletions

File tree

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ matrix:
1717
- _MINGW=mingw32
1818
- _HOST=i686-w64-mingw32
1919
before_install:
20-
- docker pull jpcima/arch-mingw
20+
- docker pull archlinux
2121
install:
22-
- container=$(docker run -d -i -t -v /home:/home jpcima/arch-mingw /bin/bash)
22+
- container=$(docker run -d -i -t -v /home:/home archlinux /bin/bash)
2323
- |
2424
cross() {
2525
docker exec -w "$(pwd)" -e "_BUILD=$_BUILD" -e "_MINGW=$_MINGW" -e "_HOST=$_HOST" -i -t "$container" "$@"
@@ -37,9 +37,9 @@ matrix:
3737
- _MINGW=mingw64
3838
- _HOST=x86_64-w64-mingw32
3939
before_install:
40-
- docker pull jpcima/arch-mingw
40+
- docker pull archlinux
4141
install:
42-
- container=$(docker run -d -i -t -v /home:/home jpcima/arch-mingw /bin/bash)
42+
- container=$(docker run -d -i -t -v /home:/home archlinux /bin/bash)
4343
- |
4444
cross() {
4545
docker exec -w "$(pwd)" -e "_BUILD=$_BUILD" -e "_MINGW=$_MINGW" -e "_HOST=$_HOST" -i -t "$container" "$@"

.travis/script-mingw.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,20 @@ export CFLAGS="-I/opt/$_MINGW/include"
3535
export CXXFLAGS="-I/opt/$_MINGW/include"
3636
export LDFLAGS="-L/opt/$_MINGW/lib"
3737

38+
# ---------------------------------------------------------------------------------------------------------------------
39+
40+
cat >>/etc/pacman.conf <<EOF
41+
[multilib]
42+
Include = /etc/pacman.d/mirrorlist
43+
44+
[mingw-w64]
45+
SigLevel = Optional TrustAll
46+
Server = https://github.com/jpcima/arch-mingw-w64/releases/download/repo.\$arch/
47+
EOF
48+
49+
pacman -Sqy --noconfirm
50+
pacman -Sq --noconfirm base-devel wine mingw-w64-gcc mingw-w64-pkg-config mingw-w64-cairo
51+
3852
# ---------------------------------------------------------------------------------------------------------------------
3953
# prepare
4054

0 commit comments

Comments
 (0)