Skip to content

Commit a742c2f

Browse files
committed
Disabble assembly on Vulkan-Loader
It'll stub out the code, and we don't ship the binary anyway, just its interface.
1 parent ee34560 commit a742c2f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts.d/47-vulkan/45-vulkan-loader.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ffbuild_dockerbuild() {
1313
mkdir build && cd build
1414

1515
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
16-
-DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -DLOADER_CODEGEN=ON -DUSE_GAS=ON ..
16+
-DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -DLOADER_CODEGEN=ON -DUSE_GAS=OFF -DUSE_MASM=OFF ..
1717
make -j$(nproc)
1818
make install DESTDIR="$FFBUILD_DESTDIR"
1919

@@ -24,9 +24,9 @@ ffbuild_dockerbuild() {
2424
rm "$FFBUILD_DESTPREFIX"/lib/libvulkan-1.dll.a
2525
"$GENDEF" "$FFBUILD_DESTPREFIX"/bin/vulkan-1.dll
2626
"$DLLTOOL" -d vulkan-1.def --output-delaylib "$FFBUILD_DESTPREFIX"/lib/libvulkan-1.a
27-
rm "$FFBUILD_DESTPREFIX"/bin/vulkan-1.dll
2827
fi
2928

29+
rm "$FFBUILD_DESTPREFIX"/bin/vulkan-1.dll
3030
sed -i -e 's/^\(Libs:\).*$/\1 -L${libdir} -lvulkan-1/' "$FFBUILD_DESTPREFIX"/lib/pkgconfig/vulkan.pc
3131
elif [[ $TARGET == linux* ]]; then
3232
gen-implib "$FFBUILD_DESTPREFIX"/lib/libvulkan{.so.1,.a}

0 commit comments

Comments
 (0)