minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-02-22 22:00:26 +01:00
Code Issues Projects Releases Wiki Activity

Specify all source fools directly on IrrlichtMt

Browse Source
This commit is contained in:
JosiahWI 2022-10-17 21:01:12 -05:00 committed by Josiah VanderZee
parent 2ae436cb2c
commit 8c9c1e57ea
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/CMakeLists.txt
View File

@ -344,9 +344,9 @@ set(link_includes
set(IRRMESHLOADER set(IRRMESHLOADER
CB3DMeshFileLoader.cpp CB3DMeshFileLoader.cpp
CGLTFMeshFileLoader.cpp
COBJMeshFileLoader.cpp COBJMeshFileLoader.cpp
CXMeshFileLoader.cpp CXMeshFileLoader.cpp
CGLTFMeshFileLoader.cpp
) )
add_library(IRRMESHOBJ OBJECT add_library(IRRMESHOBJ OBJECT
@ -543,7 +543,6 @@ target_link_libraries(IrrlichtMt PRIVATE
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${JPEG_LIBRARY} ${JPEG_LIBRARY}
${PNG_LIBRARY} ${PNG_LIBRARY}
tinygltf::tinygltf
"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>" "$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
"$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>" "$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>"
@ -575,16 +574,8 @@ if(WIN32)
set_target_properties(IrrlichtMt PROPERTIES PREFIX "") # for DLL name set_target_properties(IrrlichtMt PROPERTIES PREFIX "") # for DLL name
endif() endif()
add_subdirectory(tests)
# Installation of library # Installation of library
if(ANDROID) install(TARGETS IrrlichtMt tinygltf
set(INSTALL_TARGETS IrrlichtMt tinygltf native_app_glue)
else()
set(INSTALL_TARGETS IrrlichtMt)
endif()
install(TARGETS ${INSTALL_TARGETS}
EXPORT IrrlichtMt-export EXPORT IrrlichtMt-export
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )