And the MinGW-w64 in Ubuntu 16.04 is too old. Oh well.

This commit is contained in:
Pietro Gagliardi 2019-04-07 16:06:17 -04:00
parent 93383cd45a
commit 851bbfe74f
4 changed files with 2 additions and 42 deletions

View File

@ -4,25 +4,3 @@ variables:
releaseExamples: 'controlgallery cpp-multithread datetime drawtext histogram tester timer'
jobs:
- job: linux_386_static
displayName: 'Linux 386 Static'
pool:
vmImage: 'ubuntu-16.04'
workspace:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- script: sudo apt-get install mingw-w64 ninja-build
- template: azure-pipelines/configure.yml
parameters:
defaultLibrary: static
extraOptions: --cross-file=azure-pipelines/cross-386-mingw.txt
- template: azure-pipelines/build.yml
# - template: azure-pipelines/artifacts.yml
# parameters:
# os: linux
# arch: 386
# libtype: static
# libfiles: libui.a
# osHeader: ui_unix.h

View File

@ -3,10 +3,9 @@
parameters:
beforeConfigure: ''
defaultLibrary: 'must-be-set'
extraOptions: ''
steps:
- script: |
${{ parameters.beforeConfigure }}
meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }} ${{ parameters.extraOptions }}
meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }}
displayName: 'Configure'

View File

@ -1,16 +0,0 @@
[binaries]
c = '/usr/bin/i686-w64-mingw32-gcc-posix'
cpp = '/usr/bin/i686-w64-mingw32-g++-posix'
ar = '/usr/bin/i686-w64-mingw32-gcc-ar-posix'
strip = '/usr/bin/i686-w64-mingw32-strip'
pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
windres = '/usr/bin/i686-w64-mingw32-windres'
[properties]
root = '/usr/i686-w64-mingw32'
[host_machine]
system = 'windows'
cpu_family = 'x86'
cpu = 'i686'
endian = 'little'

View File

@ -3,6 +3,5 @@
steps:
- script: |
python -m pip install --upgrade pip setuptools wheel
# 0.50.0 has a bug that prevents cross-builds (like our MinGW-w64 build) to not work properly
pip install 'meson!=0.50.0'
pip install meson
displayName: 'Install Latest Meson'