BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-06 06:34:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge de20fc7232 into 79de30a345

Browse source
This commit is contained in:
Ploo 2026-06-05 11:24:34 +08:00 • committed by GitHub
commit 3c3a24672b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmake/sdlchecks.cmake
View file

@ -442,6 +442,7 @@ macro(CheckX11)
/usr/openwin/share/include /usr/openwin/share/include
/opt/graphics/OpenGL/include /opt/graphics/OpenGL/include
/opt/X11/include /opt/X11/include
/opt/local/include
) )
if(X_INCLUDEDIR) if(X_INCLUDEDIR)
@ -526,7 +527,16 @@ macro(CheckX11)
XGetEventData(display, cookie); XGetEventData(display, cookie);
XFreeEventData(display, cookie); XFreeEventData(display, cookie);
return 0; }" HAVE_XGENERICEVENT) return 0; }" HAVE_XGENERICEVENT)
if(HAVE_XGENERICEVENT)
# In OmniOS pkgsrc, XGenericEventCookie is defined, but fails to compile due to unrelated circumstances
# thus, if this check fails, it means that OmniOS's outdated X11 is being used
check_c_source_compiles("
#include <X11/Xlib.h>
typedef struct XGenericCookie XGenericCookie;
int main(int argc, char **argv) {
return 0; }" HAVE_XGENERICEVENT_TYPEDEF_QUIRK)
if(HAVE_XGENERICEVENT OR NOT HAVE_XGENERICEVENT_TYPEDEF_QUIRK)
set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1) set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1)
endif() endif()