geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '6dcb2868b03b21a4cfacf0d5804ee07cfde0a0c7' into main

main
Sam Lantinga 2022-06-29 17:24:57 -07:00
parent 88816d65d5 6dcb2868b0
commit 808edbcdca
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/sdlchecks.cmake
View File

@ -484,11 +484,19 @@ macro(CheckX11)
else() else()
set(HAVE_X11_SHARED TRUE) set(HAVE_X11_SHARED TRUE)
endif() endif()
if(HAVE_X11_SHARED AND X11_LIB AND XEXT_LIB) if(X11_LIB)
set(SDL_VIDEO_DRIVER_X11_DYNAMIC "\"${X11_LIB_SONAME}\"") if(HAVE_X11_SHARED)
set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "\"${XEXT_LIB_SONAME}\"") set(SDL_VIDEO_DRIVER_X11_DYNAMIC "\"${X11_LIB_SONAME}\"")
else() else()
list(APPEND EXTRA_LIBS ${X11_LIB} ${XEXT_LIB}) list(APPEND EXTRA_LIBS ${X11_LIB})
endif()
endif()
if(XEXT_LIB)
if(HAVE_X11_SHARED)
set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "\"${XEXT_LIB_SONAME}\"")
else()
list(APPEND EXTRA_LIBS ${XEXT_LIB_SONAME})
endif()
endif() endif()
else() else()
list(APPEND EXTRA_LIBS ${X11_LIB} ${XEXT_LIB}) list(APPEND EXTRA_LIBS ${X11_LIB} ${XEXT_LIB})