ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: improve compile options for VulkanMemoryAllocator

This commit is contained in:
scribam 2023-02-06 19:28:31 +01:00 committed by flyinghead
parent 85b286ec47
commit cf690fbb61
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

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

2
core/rend/vulkan/vmallocator.h
View File

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