diff options
| author | Andarwinux <Andarwinux@users.noreply.github.com> | 2024-03-21 00:00:00 +0000 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2024-03-25 15:34:59 +0100 |
| commit | bcab45149dc16cfbe111ed8da1aefcbf32a535e2 (patch) | |
| tree | e3d2a6f9809691a69187e49e677747f174468e1f | |
| parent | a46ce9e28cd97f7280c085649a79f85aa1d0fe70 (diff) | |
| download | mpv-bcab45149dc16cfbe111ed8da1aefcbf32a535e2.tar.bz2 mpv-bcab45149dc16cfbe111ed8da1aefcbf32a535e2.tar.xz | |
ci/mingw: use GAS for vulkan loader
this allows us to securely bundle the vulkan loader and include it in CI artifacts
| -rwxr-xr-x | ci/build-mingw64.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index d8449a9b0b..a2f7ba1574 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -10,6 +10,7 @@ gitclone="git clone --depth=1 --recursive --shallow-submodules" # -posix is Ubuntu's variant with pthreads support export CC=$TARGET-gcc-posix +export AS=$TARGET-gcc-posix export CXX=$TARGET-g++-posix export AR=$TARGET-ar export NM=$TARGET-nm @@ -50,9 +51,11 @@ EOF # CMake cmake_args=( -Wno-dev + -DCMAKE_SYSTEM_PROCESSOR="${fam}" -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH="$PKG_CONFIG_SYSROOT_DIR" -DCMAKE_RC_COMPILER="${TARGET}-windres" + -DCMAKE_ASM_COMPILER="$AS" -DCMAKE_BUILD_TYPE=Release ) @@ -192,7 +195,7 @@ _vulkan_loader () { [ -d Vulkan-Loader ] || $gitclone https://github.com/KhronosGroup/Vulkan-Loader builddir Vulkan-Loader cmake .. "${cmake_args[@]}" \ - -DENABLE_WERROR=OFF + -DENABLE_WERROR=OFF -DUSE_GAS=ON makeplusinstall popd } @@ -310,8 +313,10 @@ if [ "$2" = pack ]; then libgcc_*.dll lib{ssp,stdc++,winpthread}-[0-9]*.dll # compiler runtime av*.dll sw*.dll lib{ass,freetype,fribidi,harfbuzz,iconv,placebo}-[0-9]*.dll lib{shaderc_shared,spirv-cross-c-shared,dav1d}.dll zlib1.dll - # note: vulkan-1.dll is not here since drivers provide it ) + if [[ -f vulkan-1.dll ]]; then + dlls+=(vulkan-1.dll) + fi mv -v "${dlls[@]}" .. popd |