diff --git a/.gitignore b/.gitignore index 0333397..48f0222 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ rules.ninja *.pch # Exclude FreeImage binaries from being ignored +!dependencies/FreeImage/lib/linux/*.a !dependencies/FreeImage/lib/*.lib !dependencies/FreeImage/bin/*.dll diff --git a/CMakeLists.txt b/CMakeLists.txt index 2139dbe..d96ce30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,10 @@ include_directories( link_directories(${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib) # 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 add_custom_target(copy_shaders ALL diff --git a/dependencies/FreeImage/lib/linux/libfreeimage.a b/dependencies/FreeImage/lib/linux/libfreeimage.a new file mode 100644 index 0000000..93b4f94 Binary files /dev/null and b/dependencies/FreeImage/lib/linux/libfreeimage.a differ