diff --git a/CMakeLists.txt b/CMakeLists.txt index 150508167..c70e22239 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,10 +176,6 @@ else() target_compile_options(${PROJECT_NAME} PRIVATE $<$:-fno-strict-aliasing> $<$:-Wall>) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$:-Wno-nullability-completeness>) - endif() endif() target_compile_definitions(${PROJECT_NAME} PRIVATE @@ -1165,6 +1161,7 @@ if(USE_VULKAN) target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers) add_library(VulkanMemoryAllocator INTERFACE) + target_compile_options(VulkanMemoryAllocator INTERFACE $<$,$>:-Wno-nullability-completeness>) target_include_directories(VulkanMemoryAllocator INTERFACE core/deps/VulkanMemoryAllocator/include) target_link_libraries(${PROJECT_NAME} PRIVATE VulkanMemoryAllocator) diff --git a/core/rend/vulkan/vmallocator.h b/core/rend/vulkan/vmallocator.h index 9cacf6082..c6e89d4c2 100644 --- a/core/rend/vulkan/vmallocator.h +++ b/core/rend/vulkan/vmallocator.h @@ -21,8 +21,6 @@ #pragma once #include #include "vulkan.h" -#define VMA_NOT_NULL -#define VMA_NULLABLE #include "vk_mem_alloc.h" #if !defined(PRIu64) && defined(_WIN32)