mirror of https://github.com/mpv-player/mpv
ci/win32: add Vulkan-Loader
vulkan-1.dll is packaged, but is not neccessary in most cases where Vulkan Loader is already instaled by GPU driver.
This commit is contained in:
parent
89ed75e63e
commit
0125d35954
|
@ -168,6 +168,7 @@ jobs:
|
||||||
name: mpv-x86_64-windows-msvc
|
name: mpv-x86_64-windows-msvc
|
||||||
path: |
|
path: |
|
||||||
build/mpv.???
|
build/mpv.???
|
||||||
|
build/vulkan-*.dll
|
||||||
!build/mpv.lib
|
!build/mpv.lib
|
||||||
|
|
||||||
macos:
|
macos:
|
||||||
|
|
|
@ -100,6 +100,24 @@ spirv_cross_c_dep = declare_dependency(dependencies: [
|
||||||
meson.override_dependency('spirv-cross-c-shared', spirv_cross_c_dep)
|
meson.override_dependency('spirv-cross-c-shared', spirv_cross_c_dep)
|
||||||
"@
|
"@
|
||||||
|
|
||||||
|
# Manually wrap Vulkan-Loader for UPDATE_DEPS option
|
||||||
|
if (-not (Test-Path "$subprojects/vulkan")) {
|
||||||
|
New-Item -Path "$subprojects/vulkan" -ItemType Directory | Out-Null
|
||||||
|
}
|
||||||
|
Set-Content -Path "$subprojects/vulkan/meson.build" -Value @"
|
||||||
|
project('vulkan', 'cpp', version: '1.3.285')
|
||||||
|
cmake = import('cmake')
|
||||||
|
opts = cmake.subproject_options()
|
||||||
|
opts.add_cmake_defines({
|
||||||
|
'UPDATE_DEPS': 'ON',
|
||||||
|
'USE_GAS': 'ON',
|
||||||
|
})
|
||||||
|
opts.append_link_args(['-lcfgmgr32', '-Wl,/def:../subprojects/vulkan-loader/loader/vulkan-1.def'])
|
||||||
|
vulkan_proj = cmake.subproject('vulkan-loader', options: opts)
|
||||||
|
vulkan_dep = vulkan_proj.dependency('vulkan')
|
||||||
|
meson.override_dependency('vulkan', vulkan_dep)
|
||||||
|
"@
|
||||||
|
|
||||||
$projects = @(
|
$projects = @(
|
||||||
@{
|
@{
|
||||||
Path = "$subprojects/ffmpeg.wrap"
|
Path = "$subprojects/ffmpeg.wrap"
|
||||||
|
@ -131,6 +149,12 @@ $projects = @(
|
||||||
URL = "https://github.com/KhronosGroup/SPIRV-Cross"
|
URL = "https://github.com/KhronosGroup/SPIRV-Cross"
|
||||||
Revision = "main"
|
Revision = "main"
|
||||||
Method = "cmake"
|
Method = "cmake"
|
||||||
|
},
|
||||||
|
@{
|
||||||
|
Path = "$subprojects/vulkan-loader.wrap"
|
||||||
|
URL = "https://github.com/KhronosGroup/Vulkan-Loader"
|
||||||
|
Revision = "main"
|
||||||
|
Method = "cmake"
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -180,6 +204,7 @@ meson setup build `
|
||||||
-Dxxhash:cli=false `
|
-Dxxhash:cli=false `
|
||||||
-Dluajit:amalgam=true `
|
-Dluajit:amalgam=true `
|
||||||
-Dd3d11=enabled `
|
-Dd3d11=enabled `
|
||||||
|
-Dvulkan=enabled `
|
||||||
-Djavascript=enabled `
|
-Djavascript=enabled `
|
||||||
-Dlua=luajit `
|
-Dlua=luajit `
|
||||||
-Ddrm=disabled `
|
-Ddrm=disabled `
|
||||||
|
@ -188,4 +213,5 @@ meson setup build `
|
||||||
-Dwayland=disabled `
|
-Dwayland=disabled `
|
||||||
-Dx11=disabled
|
-Dx11=disabled
|
||||||
ninja -C build mpv.exe mpv.com libmpv.a
|
ninja -C build mpv.exe mpv.com libmpv.a
|
||||||
|
cp ./build/subprojects/vulkan-loader/vulkan.dll ./build/vulkan-1.dll
|
||||||
./build/mpv.com -v --no-config
|
./build/mpv.com -v --no-config
|
||||||
|
|
Loading…
Reference in New Issue