Reorganized FreeImage libraries

In dependencies/FreeImage/lib changed /linux to /UNIX and added /WIN32 to try and keep things organized.
This commit is contained in:
Jack 2024-08-24 00:27:20 -04:00
parent 17d7c6aa95
commit 6a35ad9e5c
5 changed files with 8 additions and 8 deletions

8
.gitignore vendored
View File

@ -27,10 +27,10 @@ rules.ninja
*.pch
# Exclude FreeImage binaries from being ignored
!dependencies/FreeImage/lib/linux/*.a
!dependencies/FreeImage/lib/linux/*.so
!dependencies/FreeImage/lib/*.lib
!dependencies/FreeImage/bin/*.dll
!dependencies/FreeImage/lib/UNIX/*.a
!dependencies/FreeImage/lib/UNIX/*.so
!dependencies/FreeImage/lib/WIN32/*.lib
!dependencies/FreeImage/bin/WIN32/*.dll
# Visual Studio Code settings
.vscode/

View File

@ -39,15 +39,13 @@ include_directories(
link_directories(${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib)
# Link libraries using vcpkg
if (WIN32)
target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp ${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/FreeImage.lib)
else()
if (UNIX)
target_link_libraries(TerraVisor PRIVATE
GLEW::GLEW
glfw
glm::glm
assimp::assimp
${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/linux/libfreeimage.a
${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/UNIX/libfreeimage.a
/vcpkg/installed/x64-linux/debug/lib/libtiffd.a
/vcpkg/installed/x64-linux/debug/lib/libjpeg.a
/vcpkg/installed/x64-linux/debug/lib/libz.a
@ -60,6 +58,8 @@ else()
-ldl
-lrt
)
else()
target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp ${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/WIN32/FreeImage.lib)
endif()
# Custom targets