jack
/
terravisor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add linux library to dependency

This commit is contained in:
Jack 2024-08-24 00:06:28 -04:00
parent b0e8ab8a36
commit 5e6a2a2b9c
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,6 +27,7 @@ rules.ninja
*.pch *.pch
# Exclude FreeImage binaries from being ignored # Exclude FreeImage binaries from being ignored
!dependencies/FreeImage/lib/linux/*.a
!dependencies/FreeImage/lib/*.lib !dependencies/FreeImage/lib/*.lib
!dependencies/FreeImage/bin/*.dll !dependencies/FreeImage/bin/*.dll

5
CMakeLists.txt
View File

@ -39,7 +39,10 @@ include_directories(
link_directories(${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib) link_directories(${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib)
# Link libraries using vcpkg # Link libraries using vcpkg
target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp ${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/FreeImage.lib) if (WIN32)
target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp ${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/FreeImage.lib)
else ()
target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp ${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/linux/libFreeImage.a)
# Custom targets # Custom targets
add_custom_target(copy_shaders ALL add_custom_target(copy_shaders ALL

BIN
dependencies/FreeImage/lib/linux/libfreeimage.a vendored Normal file
View File

Binary file not shown.