diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index fef04f24b..52abc409c 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -797,9 +797,7 @@ endmacro() macro(addBundledLibraries) set(EXTERNAL_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external") set(THIRD_PARTY_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/third_party") - set(BUILD_SHARED_LIBS OFF) - add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/imgui) add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/microtar EXCLUDE_FROM_ALL) @@ -887,6 +885,8 @@ macro(addBundledLibraries) add_subdirectory(${EXTERNAL_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL) add_subdirectory(${EXTERNAL_LIBS_FOLDER}/disassembler EXCLUDE_FROM_ALL) + add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/imgui) + if (LIBPL_SHARED_LIBRARY) install( TARGETS diff --git a/lib/third_party/imgui/imgui/CMakeLists.txt b/lib/third_party/imgui/imgui/CMakeLists.txt index e916b61b7..fc83b6187 100644 --- a/lib/third_party/imgui/imgui/CMakeLists.txt +++ b/lib/third_party/imgui/imgui/CMakeLists.txt @@ -28,7 +28,7 @@ if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD) target_include_directories(imgui_imgui PUBLIC ${FREETYPE_INCLUDE_DIRS}) target_link_directories(imgui_imgui PUBLIC ${FREETYPE_LIBRARY_DIRS}) - target_link_libraries(imgui_imgui PUBLIC ${FREETYPE_LIBRARIES}) + target_link_libraries(imgui_imgui PUBLIC ${FREETYPE_LIBRARIES} ${LUNASVG_LIBRARIES}) target_compile_definitions(imgui_imgui PRIVATE EXPORT_SYMBOLS=1) endif() diff --git a/lib/third_party/imgui/imgui/include/imconfig.h b/lib/third_party/imgui/imgui/include/imconfig.h index 446d46f95..6b45dd316 100644 --- a/lib/third_party/imgui/imgui/include/imconfig.h +++ b/lib/third_party/imgui/imgui/include/imconfig.h @@ -167,6 +167,7 @@ namespace ImGui #define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX #define IMGUI_USE_WCHAR32 #define IMGUI_USE_LEGACY_CRC32_ADLER 1 +#define IMGUI_ENABLE_FREETYPE_LUNASVG 1 #if defined(IMGUI_TEST_ENGINE) #include "imgui_te_imconfig.h"