configure: link with libMoltenVK on macOS

+ install MoltenVK with CI
This commit is contained in:
Martin Pulec
2023-01-17 10:56:58 +01:00
parent 3212e86efc
commit 9b58e9e481
2 changed files with 11 additions and 2 deletions

View File

@@ -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

View File

@@ -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