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:
parent
17d7c6aa95
commit
6a35ad9e5c
|
@ -27,10 +27,10 @@ rules.ninja
|
||||||
*.pch
|
*.pch
|
||||||
|
|
||||||
# Exclude FreeImage binaries from being ignored
|
# Exclude FreeImage binaries from being ignored
|
||||||
!dependencies/FreeImage/lib/linux/*.a
|
!dependencies/FreeImage/lib/UNIX/*.a
|
||||||
!dependencies/FreeImage/lib/linux/*.so
|
!dependencies/FreeImage/lib/UNIX/*.so
|
||||||
!dependencies/FreeImage/lib/*.lib
|
!dependencies/FreeImage/lib/WIN32/*.lib
|
||||||
!dependencies/FreeImage/bin/*.dll
|
!dependencies/FreeImage/bin/WIN32/*.dll
|
||||||
|
|
||||||
# Visual Studio Code settings
|
# Visual Studio Code settings
|
||||||
.vscode/
|
.vscode/
|
||||||
|
|
|
@ -39,15 +39,13 @@ 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
|
||||||
if (WIN32)
|
if (UNIX)
|
||||||
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
|
target_link_libraries(TerraVisor PRIVATE
|
||||||
GLEW::GLEW
|
GLEW::GLEW
|
||||||
glfw
|
glfw
|
||||||
glm::glm
|
glm::glm
|
||||||
assimp::assimp
|
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/libtiffd.a
|
||||||
/vcpkg/installed/x64-linux/debug/lib/libjpeg.a
|
/vcpkg/installed/x64-linux/debug/lib/libjpeg.a
|
||||||
/vcpkg/installed/x64-linux/debug/lib/libz.a
|
/vcpkg/installed/x64-linux/debug/lib/libz.a
|
||||||
|
@ -60,6 +58,8 @@ else()
|
||||||
-ldl
|
-ldl
|
||||||
-lrt
|
-lrt
|
||||||
)
|
)
|
||||||
|
else()
|
||||||
|
target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp ${CMAKE_SOURCE_DIR}/dependencies/FreeImage/lib/WIN32/FreeImage.lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Custom targets
|
# Custom targets
|
||||||
|
|
Loading…
Reference in New Issue