summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2023-08-20 17:12:35 +0200
committersfan5 <sfan5@live.de>2023-08-21 16:43:38 +0200
commit76b1d282a5e00ae667f7a351d36def0b8e2a7bc1 (patch)
treec544b365704cdf756e9cf8d13587229555637ab1 /ci
parentc936377e3458841d421a521d92fa09840779a451 (diff)
downloadmpv-76b1d282a5e00ae667f7a351d36def0b8e2a7bc1.tar.bz2
mpv-76b1d282a5e00ae667f7a351d36def0b8e2a7bc1.tar.xz
ci/mingw: disable vulkan for 32-bit build
There's some cdecl / stdcall linking nonsense breaking the build which I'm not inclined to debug this Sunday at all. 32-bit is not important anyway, so just disable it there. On the plus side the new functional structure makes this very painless.
Diffstat (limited to 'ci')
-rwxr-xr-xci/build-mingw64.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh
index 4cfc45d800..55aba1cae5 100755
--- a/ci/build-mingw64.sh
+++ b/ci/build-mingw64.sh
@@ -181,7 +181,7 @@ _libplacebo () {
[ -d libplacebo ] || $gitclone https://code.videolan.org/videolan/libplacebo.git
builddir libplacebo
meson setup .. --cross-file "$prefix_dir/crossfile" \
- -Ddemos=false -D{opengl,d3d11,vulkan}=enabled
+ -Ddemos=false -D{opengl,d3d11}=enabled
makeplusinstall
popd
}
@@ -243,10 +243,14 @@ _luajit () {
}
_luajit_mark=lib/libluajit-5.1.a
-for x in \
- iconv zlib ffmpeg shaderc spirv-cross vulkan-headers vulkan-loader \
- libplacebo freetype fribidi harfbuzz libass luajit
-do
+for x in iconv zlib ffmpeg shaderc spirv-cross; do
+ build_if_missing $x
+done
+if [[ "$TARGET" != "i686-"* ]]; then
+ build_if_missing vulkan-headers
+ build_if_missing vulkan-loader
+fi
+for x in libplacebo freetype fribidi harfbuzz libass luajit; do
build_if_missing $x
done
@@ -263,7 +267,7 @@ rm -rf $build
meson setup $build --cross-file "$prefix_dir/crossfile" \
--buildtype debugoptimized \
-Dlibmpv=true -Dlua=luajit \
- -D{shaderc,spirv-cross,d3d11,vulkan,libplacebo}=enabled
+ -D{shaderc,spirv-cross,d3d11,libplacebo}=enabled
meson compile -C $build