Skip to content

Commit 95a2381

Browse files
committed
fix package location
1 parent 79a4ce2 commit 95a2381

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

.github/workflows/linux-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
libegl1-mesa-dev libgl1-mesa-dev
2121
libflac-dev libogg-dev libvorbis-dev libmpg123-dev libopusfile-dev
2222
libxmp-dev
23+
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
2324
- name: Build SDL3
2425
run: |
2526
mkdir -p /tmp/sdl3

.github/workflows/windows-build.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,14 @@ jobs:
6666
} else {
6767
git clone https://github.com/OpenFodder/tests.git $testsDir
6868
}
69-
$ffmpegBin = "C:\vcpkg\installed\${{ matrix.vcpkg_triplet }}\bin"
69+
$ffmpegBin = "$env:GITHUB_WORKSPACE\vcpkg_installed\${{ matrix.vcpkg_triplet }}\bin"
70+
if (-not (Test-Path $ffmpegBin)) {
71+
$ffmpegBin = "C:\vcpkg\installed\${{ matrix.vcpkg_triplet }}\bin"
72+
}
73+
if (-not (Test-Path $ffmpegBin)) {
74+
Write-Error "FFmpeg binaries not found in vcpkg_installed or C:\vcpkg\installed for ${{ matrix.vcpkg_triplet }}."
75+
exit 1
76+
}
7077
Copy-Item "$ffmpegBin\avcodec*.dll" -Destination $runDir -Force
7178
Copy-Item "$ffmpegBin\avformat*.dll" -Destination $runDir -Force
7279
Copy-Item "$ffmpegBin\avutil*.dll" -Destination $runDir -Force
@@ -79,7 +86,14 @@ jobs:
7986
shell: pwsh
8087
run: |
8188
$archive = "OpenFodder-${{ matrix.arch }}-${{ matrix.configuration }}-latest.zip"
82-
$ffmpegBin = "C:\vcpkg\installed\${{ matrix.vcpkg_triplet }}\bin"
89+
$ffmpegBin = "$env:GITHUB_WORKSPACE\vcpkg_installed\${{ matrix.vcpkg_triplet }}\bin"
90+
if (-not (Test-Path $ffmpegBin)) {
91+
$ffmpegBin = "C:\vcpkg\installed\${{ matrix.vcpkg_triplet }}\bin"
92+
}
93+
if (-not (Test-Path $ffmpegBin)) {
94+
Write-Error "FFmpeg binaries not found in vcpkg_installed or C:\vcpkg\installed for ${{ matrix.vcpkg_triplet }}."
95+
exit 1
96+
}
8397
$ffmpegDlls = Get-ChildItem $ffmpegBin -Filter *.dll | Where-Object {
8498
$_.Name -match "^(avcodec|avformat|avutil|swscale|swresample)"
8599
} | Select-Object -ExpandProperty FullName

0 commit comments

Comments
 (0)