From fdf2faaf590b6add382e6ae24cd0a0d92a93f673 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Sat, 10 Aug 2024 20:56:03 -0400 Subject: [PATCH] macOS: Don't include video/input drivers when compiling with SDL2 (#16865) --- gfx/video_driver.c | 4 ++-- input/input_driver.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 8f9a3ea22d..a7dc5c0f28 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -157,7 +157,7 @@ static const gfx_ctx_driver_t *gfx_ctx_gl_drivers[] = { &gfx_ctx_cocoagl, #endif #endif -#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGL_CORE)) +#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGL_CORE)) && !defined(HAVE_COCOA) &gfx_ctx_sdl_gl, #endif #ifdef HAVE_OSMESA @@ -406,7 +406,7 @@ const video_driver_t *video_drivers[] = { #if defined(HAVE_SDL) && !defined(HAVE_SDL_DINGUX) &video_sdl, #endif -#ifdef HAVE_SDL2 +#if defined(HAVE_SDL2) && !(defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)) &video_sdl2, #endif #ifdef HAVE_SDL_DINGUX diff --git a/input/input_driver.c b/input/input_driver.c index b2e8d216da..d877e23290 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -334,7 +334,7 @@ input_driver_t *input_drivers[] = { #ifdef HAVE_DINPUT &input_dinput, #endif -#if defined(HAVE_SDL) || defined(HAVE_SDL2) +#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && !(defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)) &input_sdl, #endif #if defined(DINGUX) && defined(HAVE_SDL_DINGUX)