diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 61ab748d..4732411a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,16 +13,16 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml + - script: sudo apt-get install ninja-build - template: azure-pipelines/configure.yml parameters: - beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig 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 +# - template: azure-pipelines/artifacts.yml +# parameters: +# os: linux +# arch: 386 +# libtype: static +# libfiles: libui.a +# osHeader: ui_unix.h diff --git a/azure-pipelines/configure.yml b/azure-pipelines/configure.yml index aec307fe..f4bada4d 100644 --- a/azure-pipelines/configure.yml +++ b/azure-pipelines/configure.yml @@ -3,9 +3,10 @@ parameters: beforeConfigure: '' defaultLibrary: 'must-be-set' + extraOptions: '' steps: - script: | ${{ parameters.beforeConfigure }} - meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }} + meson setup build --buildtype=release --default-library=${{ parameters.defaultLibrary }} ${{ parameters.extraOptions }} displayName: 'Configure' diff --git a/azure-pipelines/cross-386-mingw.txt b/azure-pipelines/cross-386-mingw.txt new file mode 100644 index 00000000..7e6d221d --- /dev/null +++ b/azure-pipelines/cross-386-mingw.txt @@ -0,0 +1,16 @@ +[binaries] +c = '/usr/bin/i686-w64-mingw32-gcc-win32' +cpp = '/usr/bin/i686-w64-mingw32-g++-win32' +ar = '/usr/bin/i686-w64-mingw32-gcc-ar-win32' +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'