From f17e9d36620978793a5daa08ac747ca7ea45373c Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 18 Mar 2017 00:31:25 -0400 Subject: [PATCH] title-folder: fix SDL path on OS X The Stonesense install script appears to do strange things which cause DF to load SDL.framework/Versions/A/SDL instead of SDL.framework/SDL. Once the former is loaded, loading the latter and calling SDL_WM_* functions from it will fail. A better solution would be to remove parts of the Stonesense fix-libs-*.sh script(s) that are causing this, since they don't appear to be needed, or use dlsym() to find the already-opened library/symbols. --- plugins/title-folder.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/title-folder.cpp b/plugins/title-folder.cpp index 205f7225a..eae381b95 100644 --- a/plugins/title-folder.cpp +++ b/plugins/title-folder.cpp @@ -16,6 +16,7 @@ static std::string original_title; static DFLibrary *sdl_handle = NULL; static const std::vector sdl_libs { "SDLreal.dll", + "SDL.framework/Versions/A/SDL", "SDL.framework/SDL", "libSDL-1.2.so.0" };