From 5b148f2d7a70033f15843e44ab891ba6e652c3c9 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Wed, 25 Aug 2021 11:46:40 +0200 Subject: [PATCH] build: Remove unused dependency glm --- dist/Brewfile | 3 +-- dist/ImHex-9999.ebuild | 1 - dist/get_deps_archlinux.sh | 1 - dist/get_deps_fedora.sh | 1 - dist/get_deps_msys2.sh | 1 - dist/msys2/PKGBUILD | 1 - external/ImGui/CMakeLists.txt | 3 +-- 7 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dist/Brewfile b/dist/Brewfile index 2410b1a8d..d80c4798d 100644 --- a/dist/Brewfile +++ b/dist/Brewfile @@ -1,8 +1,7 @@ brew "glfw3" -brew "mbedtls@2" +brew "mbedtls" brew "capstone" brew "nlohmann-json" -brew "glm" brew "cmake" brew "python3" brew "freetype2" diff --git a/dist/ImHex-9999.ebuild b/dist/ImHex-9999.ebuild index cbab12190..64e7edfc7 100644 --- a/dist/ImHex-9999.ebuild +++ b/dist/ImHex-9999.ebuild @@ -28,7 +28,6 @@ RDEPEND="${DEPEND} dev-libs/mbedtls dev-libs/capstone dev-cpp/nlohmann_json - media-libs/glm x11-libs/gtk+ " BDEPEND="${DEPEND}" diff --git a/dist/get_deps_archlinux.sh b/dist/get_deps_archlinux.sh index 0b6ed0efd..a0c172eac 100755 --- a/dist/get_deps_archlinux.sh +++ b/dist/get_deps_archlinux.sh @@ -7,7 +7,6 @@ pacman -S --needed \ file \ mbedtls \ capstone \ - glm \ python3 \ freetype2 \ gtk3 diff --git a/dist/get_deps_fedora.sh b/dist/get_deps_fedora.sh index a79ebd9ad..4616c710b 100755 --- a/dist/get_deps_fedora.sh +++ b/dist/get_deps_fedora.sh @@ -6,7 +6,6 @@ dnf install \ capstone-devel \ file-devel \ glfw-devel \ - glm-devel \ mesa-libGL-devel \ mbedtls-devel \ python-devel \ diff --git a/dist/get_deps_msys2.sh b/dist/get_deps_msys2.sh index 2db2c9896..9a0a81c9d 100755 --- a/dist/get_deps_msys2.sh +++ b/dist/get_deps_msys2.sh @@ -6,7 +6,6 @@ pacman -S --needed --noconfirm \ mingw-w64-x86_64-make \ mingw-w64-x86_64-capstone \ mingw-w64-x86_64-glfw \ - mingw-w64-x86_64-glm \ mingw-w64-x86_64-file \ mingw-w64-x86_64-mbedtls \ mingw-w64-x86_64-python \ diff --git a/dist/msys2/PKGBUILD b/dist/msys2/PKGBUILD index c8169b106..ce7688aca 100644 --- a/dist/msys2/PKGBUILD +++ b/dist/msys2/PKGBUILD @@ -14,7 +14,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-dlfcn" "${MINGW_PACKAGE_PREFIX}-capstone" "${MINGW_PACKAGE_PREFIX}-glfw" - "${MINGW_PACKAGE_PREFIX}-glm" "${MINGW_PACKAGE_PREFIX}-file" "${MINGW_PACKAGE_PREFIX}-mbedtls" "${MINGW_PACKAGE_PREFIX}-polly" diff --git a/external/ImGui/CMakeLists.txt b/external/ImGui/CMakeLists.txt index d12fd55d5..f12f4c003 100644 --- a/external/ImGui/CMakeLists.txt +++ b/external/ImGui/CMakeLists.txt @@ -5,7 +5,6 @@ set(CMAKE_CXX_STANDARD 17) find_package(PkgConfig REQUIRED) find_package(Freetype REQUIRED) -pkg_search_module(GLM REQUIRED glm) pkg_search_module(GLFW REQUIRED glfw3) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") @@ -38,7 +37,7 @@ add_compile_definitions(IMGUI_IMPL_OPENGL_LOADER_GLAD) target_include_directories(imgui PUBLIC include fonts ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS}) -target_link_directories(imgui PUBLIC ${GLM_INCLUDE_DIRS} ${GLFW_LIBRARY_DIRS}) +target_link_directories(imgui PUBLIC ${GLFW_LIBRARY_DIRS}) if (WIN32) target_link_libraries(imgui Freetype::Freetype glfw3 opengl32.lib)