minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only try to link libraries when relevant feature is enabled 

fixes #182
This commit is contained in:
sfan5 2023-04-06 11:41:12 +02:00
parent f5d3448b17
commit a677f5a01a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/CMakeLists.txt
View File

@ -277,7 +277,7 @@ elseif(APPLE)
find_library(IOKIT_LIB IOKit REQUIRED) find_library(IOKIT_LIB IOKit REQUIRED)
add_definitions(-DGL_SILENCE_DEPRECATION) add_definitions(-DGL_SILENCE_DEPRECATION)
else() elseif(NOT USE_SDL2)
# Unix probably # Unix probably
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
if(USE_XINPUT2 AND NOT X11_Xi_FOUND) if(USE_XINPUT2 AND NOT X11_Xi_FOUND)
@ -292,21 +292,21 @@ set(link_includes
"${ZLIB_INCLUDE_DIR}" "${ZLIB_INCLUDE_DIR}"
"${JPEG_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}"
"${PNG_INCLUDE_DIR}" "${PNG_INCLUDE_DIR}"
"${SDL2_INCLUDE_DIRS}" "$<$<BOOL:${USE_SDL2}>:${SDL2_INCLUDE_DIRS}>"
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${OPENGLES2_INCLUDE_DIR} ${OPENGLES2_INCLUDE_DIR}
${EGL_INCLUDE_DIR} ${EGL_INCLUDE_DIR}
"$<$<PLATFORM_ID:Android>:${ANDROID_NDK}/sources/android/native_app_glue>" "$<$<PLATFORM_ID:Android>:${ANDROID_NDK}/sources/android/native_app_glue>"
${X11_INCLUDE_DIR} "$<$<BOOL:${USE_X11}>:${X11_INCLUDE_DIR}>"
) )
set(link_libs set(link_libs
"${ZLIB_LIBRARY}" "${ZLIB_LIBRARY}"
"${JPEG_LIBRARY}" "${JPEG_LIBRARY}"
"${PNG_LIBRARY}" "${PNG_LIBRARY}"
"${SDL2_LIBRARIES}" "$<$<BOOL:USE_SDL2>:${SDL2_LIBRARIES}>"
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${OPENGLES_LIBRARY} ${OPENGLES_LIBRARY}
@ -318,8 +318,8 @@ set(link_libs
${IOKIT_LIB} ${IOKIT_LIB}
"$<$<PLATFORM_ID:Windows>:gdi32>" "$<$<PLATFORM_ID:Windows>:gdi32>"
"$<$<PLATFORM_ID:Windows>:winmm>" "$<$<PLATFORM_ID:Windows>:winmm>"
${X11_X11_LIB} "$<$<BOOL:${USE_X11}>:${X11_X11_LIB}>"
${X11_Xi_LIB} "$<$<BOOL:${USE_X11}>:${X11_Xi_LIB}>"
) )
# Source files # Source files