From 77f6a638a725816291c1deaf5e82c56225951a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Wed, 17 Jul 2024 13:18:25 +0200 Subject: [PATCH] Use clang++14 with Cpp-23 on ubuntu-latest (#1921) --- .github/workflows/ci-ubuntu.yml | 4 ++-- vulkan/vulkan.hpp | 2 +- vulkan/vulkansc.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index 51fcefb..f044383 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -51,10 +51,10 @@ jobs: done done - - name: Loop over build_types (Debug, Release) with cpp_standard 23 for g++-11 and above only + - name: Loop over build_types (Debug, Release) with cpp_standard 23 for compilers supporting that run: | # g++-10 does not support Cpp-23 - if [ ${{matrix.compiler}} == clang++-15 ] || [ ${{matrix.compiler}} == g++-11 ] || [ ${{matrix.compiler}} == g++-12 ] + if [ ${{matrix.compiler}} != clang++-13 ] && [ ${{matrix.compiler}} != g++-10 ] then cpp_standard=23 for build_type in Debug Release diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index e596361..552cb6e 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -16851,7 +16851,7 @@ namespace VULKAN_HPP_NAMESPACE m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL ); } # elif defined( _WIN32 ) - m_library = ::LoadLibraryA( "vulkan-1.dll" ); + m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else # error unsupported platform # endif diff --git a/vulkan/vulkansc.hpp b/vulkan/vulkansc.hpp index f322e18..90abd2a 100644 --- a/vulkan/vulkansc.hpp +++ b/vulkan/vulkansc.hpp @@ -7094,7 +7094,7 @@ namespace VULKAN_HPP_NAMESPACE m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL ); } # elif defined( _WIN32 ) - m_library = ::LoadLibraryA( "vulkan-1.dll" ); + m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else # error unsupported platform # endif