From e1d16e9de77db4fab6d8dbdc7cf86e328becfdd0 Mon Sep 17 00:00:00 2001 From: Vinicius Rangel Date: Mon, 26 Aug 2024 08:57:08 -0300 Subject: [PATCH] added imgui as dependency --- .gitmodules | 7 ++++++- CMakeLists.txt | 2 +- externals/CMakeLists.txt | 13 +++++++++++++ externals/dear_imgui | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) create mode 160000 externals/dear_imgui diff --git a/.gitmodules b/.gitmodules index 94996586..b5bce274 100644 --- a/.gitmodules +++ b/.gitmodules @@ -81,4 +81,9 @@ [submodule "externals/ffmpeg-core"] path = externals/ffmpeg-core url = https://github.com/shadps4-emu/ext-ffmpeg-core.git - shallow = true \ No newline at end of file + shallow = true +[submodule "externals/dear_imgui"] + path = externals/dear_imgui + url = https://github.com/shadps4-emu/ext-imgui.git + shallow = true + branch = docking diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ff00d6f..1ac3a062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -608,7 +608,7 @@ endif() create_target_directory_groups(shadps4) -target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg) +target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui) target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::SPIRV glslang::glslang SDL3::SDL3) if (APPLE) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 6fe73a29..eaab9ab6 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -149,6 +149,19 @@ if (APPLE AND NOT TARGET date::date-tz) add_subdirectory(date) endif() +# Dear ImGui +block() + add_library(Dear_ImGui + dear_imgui/imgui.cpp + dear_imgui/imgui_demo.cpp + dear_imgui/imgui_draw.cpp + dear_imgui/imgui_internal.h + dear_imgui/imgui_tables.cpp + dear_imgui/imgui_widgets.cpp + ) + target_include_directories(Dear_ImGui INTERFACE dear_imgui/) +endblock() + # Tracy option(TRACY_ENABLE "" ON) option(TRACY_NO_CRASH_HANDLER "" ON) # Otherwise texture cache exceptions will be treaten as a crash diff --git a/externals/dear_imgui b/externals/dear_imgui new file mode 160000 index 00000000..636cd4a7 --- /dev/null +++ b/externals/dear_imgui @@ -0,0 +1 @@ +Subproject commit 636cd4a7d623a2bc9bf59bb3acbb4ca075befba3