From 3c5c02149cce52b667a5a523891b4314655aea25 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Tue, 4 Feb 2025 07:00:34 +0800 Subject: [PATCH] Fixes for X11 on macOS --- include/build_config/SDL_build_config_macos.h | 14 ++++++++------ src/video/x11/SDL_x11opengl.c | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git include/build_config/SDL_build_config_macos.h include/build_config/SDL_build_config_macos.h index 1a66449ac..c73ac7d86 100644 --- include/build_config/SDL_build_config_macos.h +++ include/build_config/SDL_build_config_macos.h @@ -185,15 +185,17 @@ #define SDL_TIMER_UNIX 1 /* Enable various video drivers */ +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 #define SDL_VIDEO_DRIVER_COCOA 1 +#endif #define SDL_VIDEO_DRIVER_DUMMY 1 #define SDL_VIDEO_DRIVER_OFFSCREEN 1 -#undef SDL_VIDEO_DRIVER_X11 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/opt/X11/lib/libX11.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/opt/X11/lib/libXext.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/opt/X11/lib/libXi.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/opt/X11/lib/libXrandr.2.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/opt/X11/lib/libXss.1.dylib" +#define SDL_VIDEO_DRIVER_X11 1 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "@PREFIX@/lib/libX11.6.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "@PREFIX@/lib/libXext.6.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "@PREFIX@/lib/libXi.6.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "@PREFIX@/lib/libXrandr.2.dylib" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "@PREFIX@/lib/libXss.1.dylib" #define SDL_VIDEO_DRIVER_X11_XDBE 1 #define SDL_VIDEO_DRIVER_X11_XRANDR 1 #define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1 diff --git src/video/x11/SDL_x11opengl.c src/video/x11/SDL_x11opengl.c index d46409f47..1ddacd4f3 100644 --- src/video/x11/SDL_x11opengl.c +++ src/video/x11/SDL_x11opengl.c @@ -21,6 +21,10 @@ */ #include "SDL_internal.h" +#if defined(__MACOSX__) +#include +#endif + #ifdef SDL_VIDEO_DRIVER_X11 #include "SDL_x11video.h" @@ -39,7 +43,7 @@ */ #define DEFAULT_OPENGL "libGL.so" #elif defined(SDL_PLATFORM_MACOS) -#define DEFAULT_OPENGL "/opt/X11/lib/libGL.1.dylib" +#define DEFAULT_OPENGL "@PREFIX@/lib/libGL.1.dylib" #else #define DEFAULT_OPENGL "libGL.so.1" #endif