mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Merge a5b8e33eb3
into b35641f4a3
This commit is contained in:
commit
7ef46fc4b7
@ -267,6 +267,7 @@ video tutorials.
|
|||||||
- Samuli Tuomola
|
- Samuli Tuomola
|
||||||
- Matthew Turner
|
- Matthew Turner
|
||||||
- urraka
|
- urraka
|
||||||
|
- Mark Valkin
|
||||||
- Elias Vanderstuyft
|
- Elias Vanderstuyft
|
||||||
- Stef Velzel
|
- Stef Velzel
|
||||||
- Jari Vetoniemi
|
- Jari Vetoniemi
|
||||||
|
@ -132,6 +132,7 @@ information on what to include when reporting a bug.
|
|||||||
- [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
|
- [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
|
||||||
- [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to
|
- [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to
|
||||||
`GLFW_NATIVE_CONTEXT_API` (#2518)
|
`GLFW_NATIVE_CONTEXT_API` (#2518)
|
||||||
|
- [X11] Added appropriate dynamic library names for MacOS
|
||||||
|
|
||||||
|
|
||||||
## Contact
|
## Contact
|
||||||
|
@ -372,7 +372,7 @@ GLFWbool _glfwInitEGL(void)
|
|||||||
#elif defined(_GLFW_WIN32)
|
#elif defined(_GLFW_WIN32)
|
||||||
"libEGL.dll",
|
"libEGL.dll",
|
||||||
"EGL.dll",
|
"EGL.dll",
|
||||||
#elif defined(_GLFW_COCOA)
|
#elif defined(__APPLE__)
|
||||||
"libEGL.dylib",
|
"libEGL.dylib",
|
||||||
#elif defined(__CYGWIN__)
|
#elif defined(__CYGWIN__)
|
||||||
"libEGL-1.so",
|
"libEGL-1.so",
|
||||||
@ -771,7 +771,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
|
|||||||
#elif defined(_GLFW_WIN32)
|
#elif defined(_GLFW_WIN32)
|
||||||
"GLESv1_CM.dll",
|
"GLESv1_CM.dll",
|
||||||
"libGLES_CM.dll",
|
"libGLES_CM.dll",
|
||||||
#elif defined(_GLFW_COCOA)
|
#elif defined(__APPLE__)
|
||||||
"libGLESv1_CM.dylib",
|
"libGLESv1_CM.dylib",
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
"libGLESv1_CM.so",
|
"libGLESv1_CM.so",
|
||||||
@ -788,7 +788,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
|
|||||||
#elif defined(_GLFW_WIN32)
|
#elif defined(_GLFW_WIN32)
|
||||||
"GLESv2.dll",
|
"GLESv2.dll",
|
||||||
"libGLESv2.dll",
|
"libGLESv2.dll",
|
||||||
#elif defined(_GLFW_COCOA)
|
#elif defined(__APPLE__)
|
||||||
"libGLESv2.dylib",
|
"libGLESv2.dylib",
|
||||||
#elif defined(__CYGWIN__)
|
#elif defined(__CYGWIN__)
|
||||||
"libGLESv2-2.so",
|
"libGLESv2-2.so",
|
||||||
@ -804,7 +804,8 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
|
|||||||
#if defined(_GLFW_OPENGL_LIBRARY)
|
#if defined(_GLFW_OPENGL_LIBRARY)
|
||||||
_GLFW_OPENGL_LIBRARY,
|
_GLFW_OPENGL_LIBRARY,
|
||||||
#elif defined(_GLFW_WIN32)
|
#elif defined(_GLFW_WIN32)
|
||||||
#elif defined(_GLFW_COCOA)
|
#elif defined(__APPLE__)
|
||||||
|
"libGL.1.dylib",
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
"libGL.so",
|
"libGL.so",
|
||||||
#else
|
#else
|
||||||
|
@ -263,6 +263,8 @@ GLFWbool _glfwInitGLX(void)
|
|||||||
_GLFW_GLX_LIBRARY,
|
_GLFW_GLX_LIBRARY,
|
||||||
#elif defined(__CYGWIN__)
|
#elif defined(__CYGWIN__)
|
||||||
"libGL-1.so",
|
"libGL-1.so",
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
"libGL.1.dylib",
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
"libGL.so",
|
"libGL.so",
|
||||||
#else
|
#else
|
||||||
|
@ -57,10 +57,12 @@ GLFWbool _glfwInitVulkan(int mode)
|
|||||||
_glfw.vk.handle = _glfwPlatformLoadModule(_GLFW_VULKAN_LIBRARY);
|
_glfw.vk.handle = _glfwPlatformLoadModule(_GLFW_VULKAN_LIBRARY);
|
||||||
#elif defined(_GLFW_WIN32)
|
#elif defined(_GLFW_WIN32)
|
||||||
_glfw.vk.handle = _glfwPlatformLoadModule("vulkan-1.dll");
|
_glfw.vk.handle = _glfwPlatformLoadModule("vulkan-1.dll");
|
||||||
#elif defined(_GLFW_COCOA)
|
#elif defined(__APPLE__)
|
||||||
_glfw.vk.handle = _glfwPlatformLoadModule("libvulkan.1.dylib");
|
_glfw.vk.handle = _glfwPlatformLoadModule("libvulkan.1.dylib");
|
||||||
|
#if defined(_GLFW_COCOA)
|
||||||
if (!_glfw.vk.handle)
|
if (!_glfw.vk.handle)
|
||||||
_glfw.vk.handle = _glfwLoadLocalVulkanLoaderCocoa();
|
_glfw.vk.handle = _glfwLoadLocalVulkanLoaderCocoa();
|
||||||
|
#endif
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.vk.handle = _glfwPlatformLoadModule("libvulkan.so");
|
_glfw.vk.handle = _glfwPlatformLoadModule("libvulkan.so");
|
||||||
#else
|
#else
|
||||||
|
@ -606,6 +606,8 @@ static GLFWbool initExtensions(void)
|
|||||||
{
|
{
|
||||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.vidmode.handle = _glfwPlatformLoadModule("libXxf86vm.so");
|
_glfw.x11.vidmode.handle = _glfwPlatformLoadModule("libXxf86vm.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.vidmode.handle = _glfwPlatformLoadModule("libXxf86vm.1.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.vidmode.handle = _glfwPlatformLoadModule("libXxf86vm.so.1");
|
_glfw.x11.vidmode.handle = _glfwPlatformLoadModule("libXxf86vm.so.1");
|
||||||
#endif
|
#endif
|
||||||
@ -630,6 +632,8 @@ static GLFWbool initExtensions(void)
|
|||||||
_glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi-6.so");
|
_glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi-6.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi.so");
|
_glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi.6.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi.so.6");
|
_glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi.so.6");
|
||||||
#endif
|
#endif
|
||||||
@ -662,6 +666,8 @@ static GLFWbool initExtensions(void)
|
|||||||
_glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr-2.so");
|
_glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr-2.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr.so");
|
_glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr.2.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr.so.2");
|
_glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr.so.2");
|
||||||
#endif
|
#endif
|
||||||
@ -756,6 +762,8 @@ static GLFWbool initExtensions(void)
|
|||||||
_glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor-1.so");
|
_glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor-1.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor.so");
|
_glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor.1.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor.so.1");
|
_glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor.so.1");
|
||||||
#endif
|
#endif
|
||||||
@ -779,6 +787,8 @@ static GLFWbool initExtensions(void)
|
|||||||
_glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama-1.so");
|
_glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama-1.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama.so");
|
_glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama.1.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama.so.1");
|
_glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama.so.1");
|
||||||
#endif
|
#endif
|
||||||
@ -834,6 +844,8 @@ static GLFWbool initExtensions(void)
|
|||||||
_glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb-1.so");
|
_glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb-1.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb.so");
|
_glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb.1.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb.so.1");
|
_glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb.so.1");
|
||||||
#endif
|
#endif
|
||||||
@ -849,6 +861,8 @@ static GLFWbool initExtensions(void)
|
|||||||
_glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender-1.so");
|
_glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender-1.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender.so");
|
_glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender.1.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender.so.1");
|
_glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender.so.1");
|
||||||
#endif
|
#endif
|
||||||
@ -878,6 +892,8 @@ static GLFWbool initExtensions(void)
|
|||||||
_glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext-6.so");
|
_glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext-6.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
_glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext.so");
|
_glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
_glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext.6.dylib");
|
||||||
#else
|
#else
|
||||||
_glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext.so.6");
|
_glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext.so.6");
|
||||||
#endif
|
#endif
|
||||||
@ -1259,6 +1275,8 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform)
|
|||||||
void* module = _glfwPlatformLoadModule("libX11-6.so");
|
void* module = _glfwPlatformLoadModule("libX11-6.so");
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
void* module = _glfwPlatformLoadModule("libX11.so");
|
void* module = _glfwPlatformLoadModule("libX11.so");
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
void* module = _glfwPlatformLoadModule("libX11.6.dylib");
|
||||||
#else
|
#else
|
||||||
void* module = _glfwPlatformLoadModule("libX11.so.6");
|
void* module = _glfwPlatformLoadModule("libX11.so.6");
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user