From fa83e52407d71cd6188e37b853288cf95bf04530 Mon Sep 17 00:00:00 2001 From: CocoSimone Date: Thu, 11 Aug 2022 10:42:37 +0200 Subject: [PATCH] do not link vulkan, volk loads it dynamically --- external/imgui/CMakeLists.txt | 3 --- src/frontend/imgui/CMakeLists.txt | 4 +++- src/frontend/imgui/Window.hpp | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/external/imgui/CMakeLists.txt b/external/imgui/CMakeLists.txt index 18356973..ebeb86f1 100644 --- a/external/imgui/CMakeLists.txt +++ b/external/imgui/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.20) project(imgui) find_package(SDL2 REQUIRED) -find_package(PkgConfig REQUIRED) -pkg_search_module(Vulkan REQUIRED vulkan) add_library(imgui imgui/imgui_demo.cpp @@ -19,5 +17,4 @@ add_library(imgui imgui/backends/imgui_impl_vulkan.h imgui/backends/imgui_impl_vulkan.cpp) -target_link_libraries(imgui PUBLIC SDL2 vulkan) target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends) \ No newline at end of file diff --git a/src/frontend/imgui/CMakeLists.txt b/src/frontend/imgui/CMakeLists.txt index 94a6cc8a..d3ab60fa 100644 --- a/src/frontend/imgui/CMakeLists.txt +++ b/src/frontend/imgui/CMakeLists.txt @@ -4,6 +4,8 @@ project(frontend-imgui) add_subdirectory(../../../external/imgui temp) add_subdirectory(../../../external/nativefiledialog-extended temp1) +find_package(SDL2 REQUIRED) + add_library(frontend-imgui Window.cpp Window.hpp) @@ -20,4 +22,4 @@ target_include_directories(frontend-imgui PUBLIC ../../../external/parallel-rdp/parallel-rdp-standalone/vulkan ../../../external/parallel-rdp/parallel-rdp-standalone/util ../../../external/parallel-rdp/parallel-rdp-standalone/volk) -target_link_libraries(frontend-imgui PUBLIC imgui nfd) \ No newline at end of file +target_link_libraries(frontend-imgui PUBLIC SDL2 imgui nfd) \ No newline at end of file diff --git a/src/frontend/imgui/Window.hpp b/src/frontend/imgui/Window.hpp index 8930b32e..8c9aa9d0 100644 --- a/src/frontend/imgui/Window.hpp +++ b/src/frontend/imgui/Window.hpp @@ -1,9 +1,7 @@ #pragma once #include -#include #include #include -#define VULKAN_DEBUG #include #include #include