build: Remove unused dependency glm
This commit is contained in:
parent
ef0a915188
commit
5b148f2d7a
3
dist/Brewfile
vendored
3
dist/Brewfile
vendored
@ -1,8 +1,7 @@
|
|||||||
brew "glfw3"
|
brew "glfw3"
|
||||||
brew "mbedtls@2"
|
brew "mbedtls"
|
||||||
brew "capstone"
|
brew "capstone"
|
||||||
brew "nlohmann-json"
|
brew "nlohmann-json"
|
||||||
brew "glm"
|
|
||||||
brew "cmake"
|
brew "cmake"
|
||||||
brew "python3"
|
brew "python3"
|
||||||
brew "freetype2"
|
brew "freetype2"
|
||||||
|
1
dist/ImHex-9999.ebuild
vendored
1
dist/ImHex-9999.ebuild
vendored
@ -28,7 +28,6 @@ RDEPEND="${DEPEND}
|
|||||||
dev-libs/mbedtls
|
dev-libs/mbedtls
|
||||||
dev-libs/capstone
|
dev-libs/capstone
|
||||||
dev-cpp/nlohmann_json
|
dev-cpp/nlohmann_json
|
||||||
media-libs/glm
|
|
||||||
x11-libs/gtk+
|
x11-libs/gtk+
|
||||||
"
|
"
|
||||||
BDEPEND="${DEPEND}"
|
BDEPEND="${DEPEND}"
|
||||||
|
1
dist/get_deps_archlinux.sh
vendored
1
dist/get_deps_archlinux.sh
vendored
@ -7,7 +7,6 @@ pacman -S --needed \
|
|||||||
file \
|
file \
|
||||||
mbedtls \
|
mbedtls \
|
||||||
capstone \
|
capstone \
|
||||||
glm \
|
|
||||||
python3 \
|
python3 \
|
||||||
freetype2 \
|
freetype2 \
|
||||||
gtk3
|
gtk3
|
||||||
|
1
dist/get_deps_fedora.sh
vendored
1
dist/get_deps_fedora.sh
vendored
@ -6,7 +6,6 @@ dnf install \
|
|||||||
capstone-devel \
|
capstone-devel \
|
||||||
file-devel \
|
file-devel \
|
||||||
glfw-devel \
|
glfw-devel \
|
||||||
glm-devel \
|
|
||||||
mesa-libGL-devel \
|
mesa-libGL-devel \
|
||||||
mbedtls-devel \
|
mbedtls-devel \
|
||||||
python-devel \
|
python-devel \
|
||||||
|
1
dist/get_deps_msys2.sh
vendored
1
dist/get_deps_msys2.sh
vendored
@ -6,7 +6,6 @@ pacman -S --needed --noconfirm \
|
|||||||
mingw-w64-x86_64-make \
|
mingw-w64-x86_64-make \
|
||||||
mingw-w64-x86_64-capstone \
|
mingw-w64-x86_64-capstone \
|
||||||
mingw-w64-x86_64-glfw \
|
mingw-w64-x86_64-glfw \
|
||||||
mingw-w64-x86_64-glm \
|
|
||||||
mingw-w64-x86_64-file \
|
mingw-w64-x86_64-file \
|
||||||
mingw-w64-x86_64-mbedtls \
|
mingw-w64-x86_64-mbedtls \
|
||||||
mingw-w64-x86_64-python \
|
mingw-w64-x86_64-python \
|
||||||
|
1
dist/msys2/PKGBUILD
vendored
1
dist/msys2/PKGBUILD
vendored
@ -14,7 +14,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
|
|||||||
"${MINGW_PACKAGE_PREFIX}-dlfcn"
|
"${MINGW_PACKAGE_PREFIX}-dlfcn"
|
||||||
"${MINGW_PACKAGE_PREFIX}-capstone"
|
"${MINGW_PACKAGE_PREFIX}-capstone"
|
||||||
"${MINGW_PACKAGE_PREFIX}-glfw"
|
"${MINGW_PACKAGE_PREFIX}-glfw"
|
||||||
"${MINGW_PACKAGE_PREFIX}-glm"
|
|
||||||
"${MINGW_PACKAGE_PREFIX}-file"
|
"${MINGW_PACKAGE_PREFIX}-file"
|
||||||
"${MINGW_PACKAGE_PREFIX}-mbedtls"
|
"${MINGW_PACKAGE_PREFIX}-mbedtls"
|
||||||
"${MINGW_PACKAGE_PREFIX}-polly"
|
"${MINGW_PACKAGE_PREFIX}-polly"
|
||||||
|
3
external/ImGui/CMakeLists.txt
vendored
3
external/ImGui/CMakeLists.txt
vendored
@ -5,7 +5,6 @@ set(CMAKE_CXX_STANDARD 17)
|
|||||||
|
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
find_package(Freetype REQUIRED)
|
find_package(Freetype REQUIRED)
|
||||||
pkg_search_module(GLM REQUIRED glm)
|
|
||||||
pkg_search_module(GLFW REQUIRED glfw3)
|
pkg_search_module(GLFW REQUIRED glfw3)
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
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_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)
|
if (WIN32)
|
||||||
target_link_libraries(imgui Freetype::Freetype glfw3 opengl32.lib)
|
target_link_libraries(imgui Freetype::Freetype glfw3 opengl32.lib)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user