From cf690fbb6129bd68bc3a16f670c2655334a29d72 Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Mon, 6 Feb 2023 19:28:31 +0100
Subject: [PATCH] cmake: improve compile options for VulkanMemoryAllocator

---
 CMakeLists.txt                 | 5 +----
 core/rend/vulkan/vmallocator.h | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

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
 		$<$<COMPILE_LANGUAGE:CXX>:-fno-strict-aliasing>
 		$<$<COMPILE_LANGUAGE:CXX>:-Wall>)
-	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-		target_compile_options(${PROJECT_NAME} PRIVATE
-			$<$<COMPILE_LANGUAGE:CXX>:-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 $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:AppleClang,Clang>>:-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 <cinttypes>
 #include "vulkan.h"
-#define VMA_NOT_NULL
-#define VMA_NULLABLE
 #include "vk_mem_alloc.h"
 
 #if !defined(PRIu64) && defined(_WIN32)