From 9b58e9e481fcd3ba786dd01410f0d3cc37d65434 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 17 Jan 2023 10:56:58 +0100 Subject: [PATCH] configure: link with libMoltenVK on macOS + install MoltenVK with CI --- .github/scripts/macOS/prepare.sh | 3 ++- configure.ac | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index dc2efc935..5967e0ee3 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -18,7 +18,8 @@ echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> "$GITHUB_ENV" brew install autoconf automake cppunit libtool pkg-config brew install libsoxr speexdsp -brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf vulkan-loader +brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf +brew install molten-vk vulkan-headers brew install imagemagick jack libnatpmp opencv wolfssl brew install ossp-uuid # for cineform brew install qt@5 diff --git a/configure.ac b/configure.ac index b85ec175e..539ca711d 100644 --- a/configure.ac +++ b/configure.ac @@ -1248,7 +1248,15 @@ AC_ARG_ENABLE(vulkan, [vulkan_req=$build_default] ) -PKG_CHECK_MODULES([VULKAN], [vulkan >= 1.1.101], [found_vulkan=yes], [found_vulkan=no]) +SAVED_LIBS=$LIBS +VULKAN_LIBS="-L/opt/homebrew/lib -lMoltenVK" +LIBS="$LIBS $VULKAN_LIBS" +AC_CHECK_FUNCS(vkCreateImage, [found_vulkan=yes], [found_vulkan=no]) +LIBS=$SAVED_LIBS +if test "$found_vulkan" = no; then + VULKAN_LIBS= + PKG_CHECK_MODULES([VULKAN], [vulkan >= 1.1.101], [found_vulkan=yes], [found_vulkan=no]) +fi AC_CHECK_HEADERS([vulkan/vulkan.h], [], [found_vulkan=no]) if test $vulkan_req != no -a $sdl = yes -a $sdl_version = 2 -a $found_vulkan = yes