encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5f7eb88ae0990f89ec3a4bf697ec03aafee1a9a8' into main

This commit is contained in:
Sam Lantinga 2021-03-15 09:00:37 -07:00
parent 00f93e4082 5f7eb88ae0
commit 30bef5dcc3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/SDL_egl.c
View File

@ -73,6 +73,7 @@
#define DEFAULT_OGL_ES "libGLESv1_CM.dylib" //??? #define DEFAULT_OGL_ES "libGLESv1_CM.dylib" //???
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
/* OpenBSD */
#define DEFAULT_OGL "libGL.so" #define DEFAULT_OGL "libGL.so"
#define DEFAULT_EGL "libEGL.so" #define DEFAULT_EGL "libEGL.so"
#define DEFAULT_OGL_ES2 "libGLESv2.so" #define DEFAULT_OGL_ES2 "libGLESv2.so"
@ -80,9 +81,10 @@
#define DEFAULT_OGL_ES "libGLESv1_CM.so" #define DEFAULT_OGL_ES "libGLESv1_CM.so"
#else #else
/* Desktop Linux */ /* Desktop Linux/Unix-like */
#define DEFAULT_OGL "libGL.so.1" #define DEFAULT_OGL "libGL.so.1"
#define DEFAULT_EGL "libEGL.so.1" #define DEFAULT_EGL "libEGL.so.1"
#define ALT_OGL "libOpenGL.so.1"
#define DEFAULT_OGL_ES2 "libGLESv2.so.2" #define DEFAULT_OGL_ES2 "libGLESv2.so.2"
#define DEFAULT_OGL_ES_PVR "libGLES_CM.so.1" #define DEFAULT_OGL_ES_PVR "libGLES_CM.so.1"
#define DEFAULT_OGL_ES "libGLESv1_CM.so.1" #define DEFAULT_OGL_ES "libGLESv1_CM.so.1"
@ -374,6 +376,12 @@ SDL_EGL_LoadLibraryOnly(_THIS, const char *egl_path)
else { else {
path = DEFAULT_OGL; path = DEFAULT_OGL;
egl_dll_handle = SDL_LoadObject(path); egl_dll_handle = SDL_LoadObject(path);
#ifdef ALT_OGL
if (egl_dll_handle == NULL) {
path = ALT_OGL;
egl_dll_handle = SDL_LoadObject(path);
}
#endif
} }
#endif #endif
} }