tmp

kasper93 · May 18, 2024 · 51cc11c · 51cc11c
1 parent d46f4f9
commit 51cc11c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,7 +53,7 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install -y autoconf automake ccache g++-mingw-w64 gcc-multilib meson nasm ninja-build pkg-config python3-pip wine wine32 wine64
+          sudo apt-get install -y ccache g++-mingw-w64 meson nasm ninja-build pkg-config wine-binfmt
 
       - name: Build libraries
         run: |
@@ -76,7 +76,7 @@ jobs:
       - name: Functional test
         id: tests
         run: |
-          cd artifact && wine64 ./mpv.com -v --no-config
+          cd artifact && ./mpv.com -v --no-config
         env:
           WINEDEBUG: '+loaddll'
 

diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh
@@ -245,8 +245,7 @@ _harfbuzz_mark=lib/libharfbuzz.dll.a
 _libass () {
     [ -d libass ] || $gitclone https://github.com/libass/libass.git
     builddir libass
-    [ -f ../configure ] || (cd .. && ./autogen.sh)
-    ../configure --host=$TARGET $commonflags
+    meson setup .. --cross-file "$prefix_dir/crossfile"
     makeplusinstall
     popd
 }