ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up irrlicht linking

Browse Source
This commit is contained in:
Benau 2020-06-12 12:23:43 +08:00
parent 784d641ebc
commit a201507763
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/irrlicht/CMakeLists.txt
View File

@ -13,19 +13,6 @@ if(NOT SERVER_ONLY)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
endif() endif()
if(UNIX AND NOT APPLE)
find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR})
if(NOT X11_FOUND)
message(FATAL_ERROR "X11 not found.")
endif()
if(NOT X11_Xrandr_FOUND)
message(FATAL_ERROR "XRANDR not found.")
endif()
endif()
if(NOT APPLE AND USE_GLES2) if(NOT APPLE AND USE_GLES2)
find_package(EGL) find_package(EGL)
@ -580,23 +567,17 @@ if(IOS)
set_source_files_properties(source/Irrlicht/CIrrDeviceiOS.mm PROPERTIES LANGUAGE C) set_source_files_properties(source/Irrlicht/CIrrDeviceiOS.mm PROPERTIES LANGUAGE C)
endif() endif()
add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES}) add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
target_link_libraries(stkirrlicht ${ZLIB_LIBRARY}) target_link_libraries(stkirrlicht ${ZLIB_LIBRARY})
if(NOT SERVER_ONLY) if(NOT SERVER_ONLY)
target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY}) target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY})
if(UNIX AND NOT APPLE)
target_link_libraries(stkirrlicht ${X11_X11_LIB} ${X11_Xrandr_LIB})
endif()
if(NOT APPLE AND USE_GLES2) if(NOT APPLE AND USE_GLES2)
target_link_libraries(stkirrlicht ${EGL_LIBRARY}) target_link_libraries(stkirrlicht ${EGL_LIBRARY})
endif() endif()
endif() endif()
if(WIN32) if(WIN32)
target_link_libraries(stkirrlicht imm32 xinput9_1_0) target_link_libraries(stkirrlicht imm32)
endif() endif()