History

ci/{mingw,win32}: specify nasm as it seems to be required now by libass

Fixes mingw and win32 builds after https://github.com/libass/libass/commit/1774117b8048d6296c79425cfbb1086bcd2ac2fa

Kacper Michajłow committed 2 years ago

Commit 08935d51 parent acc69e02 files · +2 −1Browse files

Unified · Split

2 files
  1. .github/workflows/build.yml +1 −1
  2. ci/build-mingw64.sh +1 −0
.github/workflows/build.yml+1−1
@@ -163,7 +163,7 @@ jobs: · 162 unmodified lines
163 python -m pip install build wheel163 python -m pip install build wheel
164 python -m build --wheel --no-isolation meson164 python -m build --wheel --no-isolation meson
165 python -m pip install (Get-Item ./meson/dist/meson-*-py3-none-any.whl).FullName165 python -m pip install (Get-Item ./meson/dist/meson-*-py3-none-any.whl).FullName
166 choco install ccache166 choco install ccache nasm
167 167
168 - name: Update Meson WrapDB168 - name: Update Meson WrapDB
169 run: |169 run: |
ci/build-mingw64.sh+1−0
@@ -46,6 +46,7 @@ pkgconfig = 'pkg-config' · 45 unmodified lines
46pkg-config = 'pkg-config'46pkg-config = 'pkg-config'
47windres = '${TARGET}-windres'47windres = '${TARGET}-windres'
48dlltool = '${TARGET}-dlltool'48dlltool = '${TARGET}-dlltool'
49nasm = 'nasm'
49exe_wrapper = '${WINE}'50exe_wrapper = '${WINE}'
50[host_machine]51[host_machine]
51system = 'windows'52system = 'windows'

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t