Mercurial > minori

diff .builds/windows.yml @ 343:1faa72660932

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*: transfer back to cmake from autotools autotools just made lots of things more complicated than they should have and many things broke (i.e. translations)
author Paper <paper@paper.us.eu.org>
date Thu, 20 Jun 2024 05:56:06 -0400
parents 3c755136f074
children 676b9967d8c6
line wrap: on
line diff
--- a/.builds/windows.yml	Thu Jun 20 03:03:05 2024 -0400
+++ b/.builds/windows.yml	Thu Jun 20 05:56:06 2024 -0400
@@ -29,12 +29,11 @@
       echo MINGW64 >msystem.txt
       make install _gcc _qt5-base _qt5-tools _curl
       cd ../minori
-      autoreconf -i
       mkdir build64
       cd build64
       sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
       python3 -m pip install --user --break-system-packages mingw-ldd
-      bash -c 'source ../../quasi-msys2-win64/env/all.src && ../configure && make && env DIR=minori64 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh'
+      bash -c 'export MSYSTEM=mingw64 && source ../../quasi-msys2-win64/env/all.src && cmake .. -G "Unix Makefiles" && make && env DIR=minori64 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh'
   - get-wine32: |
       sudo dpkg --add-architecture i386
       sudo apt-get update
@@ -50,7 +49,7 @@
       mkdir build32
       cd build32
       sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
-      bash -c 'source ../../quasi-msys2-win32/env/all.src && ../configure && make && env DIR=minori32 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh'
+      bash -c 'export MSYSTEM=mingw32 && source ../../quasi-msys2-win32/env/all.src && cmake .. -G "Unix Makefiles" && make && env DIR=minori32 LDD="$HOME/.local/bin/mingw-ldd" sh ../scripts/win32/deploy_build.sh'
 artifacts:
   - minori/build64/minori64.zip
   - minori/build32/minori32.zip