Browse Source
[cmake] fix video_core and tests comp errors on Windows (#2631 )
did not link to video_core thus did not properly propagate the GPUOpen
target thus failed to find vk_mem_alloc
also msvc sucks
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2631
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
descriptor_set
crueter
3 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with
12 additions and
1 deletions
src/tests/CMakeLists.txt
src/video_core/vulkan_common/vma.h
@ -1,3 +1,6 @@
# S P D X - F i l e C o p y r i g h t T e x t : C o p y r i g h t 2 0 2 5 E d e n E m u l a t o r P r o j e c t
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 3 . 0 - o r - l a t e r
# S P D X - F i l e C o p y r i g h t T e x t : 2 0 1 8 y u z u E m u l a t o r P r o j e c t
# S P D X - F i l e C o p y r i g h t T e x t : 2 0 1 8 y u z u E m u l a t o r P r o j e c t
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 2 . 0 - o r - l a t e r
# S P D X - L i c e n s e - I d e n t i f i e r : G P L - 2 . 0 - o r - l a t e r
@ -21,7 +24,7 @@ add_executable(tests
create_target_directory_groups ( tests )
create_target_directory_groups ( tests )
target_link_libraries ( tests PRIVATE common core input_common )
target_link_libraries ( tests PRIVATE common core input_common video_core )
target_link_libraries ( tests PRIVATE ${ PLATFORM_LIBRARIES } Catch2::Catch2WithMain Threads::Threads )
target_link_libraries ( tests PRIVATE ${ PLATFORM_LIBRARIES } Catch2::Catch2WithMain Threads::Threads )
add_test ( NAME tests COMMAND tests )
add_test ( NAME tests COMMAND tests )
@ -10,4 +10,12 @@
# define VMA_STATIC_VULKAN_FUNCTIONS 0
# define VMA_STATIC_VULKAN_FUNCTIONS 0
# define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
# define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
# ifdef _MSC_VER
# pragma warning( push )
# pragma warning( disable : 4189 )
# endif
# include "vk_mem_alloc.h"
# include "vk_mem_alloc.h"
# ifdef _MSC_VER
# pragma warning( pop )
# endif