iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

do not link vulkan, volk loads it dynamically

Browse Source
This commit is contained in:
CocoSimone
2022-08-11 10:42:37 +02:00
parent 325ef2a66b
commit fa83e52407
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
external/imgui/CMakeLists.txt vendored
View File

@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.20)
project(imgui) project(imgui)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_search_module(Vulkan REQUIRED vulkan)
add_library(imgui add_library(imgui
imgui/imgui_demo.cpp imgui/imgui_demo.cpp
@@ -19,5 +17,4 @@ add_library(imgui
imgui/backends/imgui_impl_vulkan.h imgui/backends/imgui_impl_vulkan.h
imgui/backends/imgui_impl_vulkan.cpp) imgui/backends/imgui_impl_vulkan.cpp)
target_link_libraries(imgui PUBLIC SDL2 vulkan)
target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends) target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIRS} imgui imgui/backends)

4
src/frontend/imgui/CMakeLists.txt
View File

@@ -4,6 +4,8 @@ project(frontend-imgui)
add_subdirectory(../../../external/imgui temp) add_subdirectory(../../../external/imgui temp)
add_subdirectory(../../../external/nativefiledialog-extended temp1) add_subdirectory(../../../external/nativefiledialog-extended temp1)
find_package(SDL2 REQUIRED)
add_library(frontend-imgui add_library(frontend-imgui
Window.cpp Window.cpp
Window.hpp) 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/vulkan
../../../external/parallel-rdp/parallel-rdp-standalone/util ../../../external/parallel-rdp/parallel-rdp-standalone/util
../../../external/parallel-rdp/parallel-rdp-standalone/volk) ../../../external/parallel-rdp/parallel-rdp-standalone/volk)
target_link_libraries(frontend-imgui PUBLIC imgui nfd) target_link_libraries(frontend-imgui PUBLIC SDL2 imgui nfd)

2
src/frontend/imgui/Window.hpp
View File

@@ -1,9 +1,7 @@
#pragma once #pragma once
#include <parallel-rdp/ParallelRDPWrapper.hpp> #include <parallel-rdp/ParallelRDPWrapper.hpp>
#include <volk.h>
#include <imgui.h> #include <imgui.h>
#include <imgui_impl_sdl.h> #include <imgui_impl_sdl.h>
#define VULKAN_DEBUG
#include <imgui_impl_vulkan.h> #include <imgui_impl_vulkan.h>
#include <SDL2/SDL_video.h> #include <SDL2/SDL_video.h>
#include <Core.hpp> #include <Core.hpp>