|
@@ -105,6 +105,11 @@
|
|
|
#endif
|
|
|
|
|
|
// GLFW
|
|
|
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
|
|
+#define GLFW_HAS_X11_OR_WAYLAND 1
|
|
|
+#else
|
|
|
+#define GLFW_HAS_X11_OR_WAYLAND 0
|
|
|
+#endif
|
|
|
#include <GLFW/glfw3.h>
|
|
|
#ifdef _WIN32
|
|
|
#undef APIENTRY
|
|
@@ -117,8 +122,8 @@
|
|
|
#define GLFW_EXPOSE_NATIVE_COCOA
|
|
|
#endif
|
|
|
#include <GLFW/glfw3native.h>
|
|
|
-#elif !defined(__EMSCRIPTEN__)
|
|
|
-#ifndef GLFW_EXPOSE_NATIVE_X11 // for glfwGetX11Window() on Freedesktop (Linux, BSD, etc.)
|
|
|
+#elif GLFW_HAS_X11_OR_WAYLAND
|
|
|
+#ifndef GLFW_EXPOSE_NATIVE_X11 // for glfwGetX11Display(), glfwGetX11Window() on Freedesktop (Linux, BSD, etc.)
|
|
|
#define GLFW_EXPOSE_NATIVE_X11
|
|
|
#endif
|
|
|
#ifndef GLFW_EXPOSE_NATIVE_WAYLAND
|
|
@@ -154,11 +159,6 @@
|
|
|
#define GLFW_HAS_GETKEYNAME (GLFW_VERSION_COMBINED >= 3200) // 3.2+ glfwGetKeyName()
|
|
|
#define GLFW_HAS_GETERROR (GLFW_VERSION_COMBINED >= 3300) // 3.3+ glfwGetError()
|
|
|
#define GLFW_HAS_GETPLATFORM (GLFW_VERSION_COMBINED >= 3400) // 3.4+ glfwGetPlatform()
|
|
|
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
|
|
-#define GLFW_HAS_X11_OR_WAYLAND 1
|
|
|
-#else
|
|
|
-#define GLFW_HAS_X11_OR_WAYLAND 0
|
|
|
-#endif
|
|
|
|
|
|
// Map GLFWWindow* to ImGuiContext*.
|
|
|
// - Would be simpler if we could use glfwSetWindowUserPointer()/glfwGetWindowUserPointer(), but this is a single and shared resource.
|