From 1bf50f9c230f0edfe6b60925edd70a899c55bc85 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Tue, 29 Nov 2022 22:40:14 +0300
Subject: [PATCH] Mac: removed SDL3_LIBNAME2, i.e.: libSDL3.dylib
See https://github.com/libsdl-org/SDL/pull/6705
---
src/sdl2_compat.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index f73f9d7..f830c49 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -128,8 +128,6 @@ static char loaderror[256];
#include <pwd.h>
#include <unistd.h>
#define SDL3_LIBNAME "libSDL3.0.dylib"
- /* SDL3 cmake'ry is (was?) messy: */
- #define SDL3_LIBNAME2 "libSDL3.dylib"
#define SDL3_FRAMEWORK "SDL3.framework/Versions/A/SDL3"
#define strcpy_fn strcpy
#define sprintf_fn sprintf
@@ -140,15 +138,12 @@ static char loaderror[256];
/* I don't know if this is the _right_ order to try, but this seems reasonable */
static const char * const dylib_locations[] = {
"@loader_path/" SDL3_LIBNAME, /* MyApp.app/Contents/MacOS/libSDL3.0.dylib */
- "@loader_path/" SDL3_LIBNAME2, /* MyApp.app/Contents/MacOS/libSDL3.dylib */
"@loader_path/../Frameworks/" SDL3_FRAMEWORK, /* MyApp.app/Contents/Frameworks/SDL2.framework */
"@executable_path/" SDL3_LIBNAME, /* MyApp.app/Contents/MacOS/libSDL3.0.dylib */
- "@executable_path/" SDL3_LIBNAME2, /* MyApp.app/Contents/MacOS/libSDL3.dylib */
"@executable_path/../Frameworks/" SDL3_FRAMEWORK, /* MyApp.app/Contents/Frameworks/SDL2.framework */
NULL, /* /Users/username/Library/Frameworks/SDL2.framework */
"/Library/Frameworks" SDL3_FRAMEWORK, /* /Library/Frameworks/SDL2.framework */
- SDL3_LIBNAME, /* oh well, anywhere the system can see the .dylib (/usr/local/lib or whatever) */
- SDL3_LIBNAME2
+ SDL3_LIBNAME /* oh well, anywhere the system can see the .dylib (/usr/local/lib or whatever) */
};
int i;