diff --git a/cmake/Findimgui.cmake b/cmake/Findimgui.cmake deleted file mode 100644 index 7c7b1eb..0000000 --- a/cmake/Findimgui.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Andrea Pappacoda -# SPDX-License-Identifier: ISC - -find_package(PkgConfig) - -if (PKG_CONFIG_FOUND) - pkg_search_module(imgui IMPORTED_TARGET GLOBAL imgui) - if (imgui_FOUND) - add_library(imgui::imgui ALIAS PkgConfig::imgui) - endif() -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(imgui - REQUIRED_VARS - imgui_LINK_LIBRARIES - imgui_FOUND - VERSION_VAR - imgui_VERSION -) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e7ff0e..93854fb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -92,7 +92,7 @@ target_link_libraries(CemuBin PRIVATE CemuAsm) target_link_libraries(CemuBin PRIVATE OpenSSL::SSL OpenSSL::Crypto) target_link_libraries(CemuBin PRIVATE ZLIB::ZLIB) target_link_libraries(CemuBin PRIVATE CURL::libcurl) -target_link_libraries(CemuBin PRIVATE pugixml pugixml::static pugixml::pugixml) +target_link_libraries(CemuBin PRIVATE pugixml pugixml::shared pugixml::pugixml) target_link_libraries(CemuBin PRIVATE SDL2::SDL2 SDL2::SDL2main) # is SDL2main needed? target_link_libraries(CemuBin PRIVATE imguiImpl OpenGL::GL) diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt index 941c06b..b9048ec 100644 --- a/src/Common/CMakeLists.txt +++ b/src/Common/CMakeLists.txt @@ -33,7 +33,7 @@ target_link_libraries(CemuCommon PRIVATE Boost::headers Boost::nowide Boost::filesystem - glm::glm + glm X11::X11 X11::Xrender X11::Xutil diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt index ca4bb14..b9bdda6 100644 --- a/src/input/CMakeLists.txt +++ b/src/input/CMakeLists.txt @@ -103,7 +103,7 @@ target_link_libraries(CemuInput PRIVATE CemuUtil Boost::headers Boost::program_options - glm::glm + glm SDL2::SDL2 )