diff options
| author | raysan5 <[email protected]> | 2017-12-09 19:05:42 +0100 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2017-12-09 19:05:42 +0100 |
| commit | 5ae2c0d15b349ce59425c319165505bda8298a6c (patch) | |
| tree | 6e7337454f5b7a72df074799553478b4cb3af7d6 /src/rglfw.c | |
| parent | 3b5a26099e0cde67084481eb6048058578b30a0c (diff) | |
| download | raylib-5ae2c0d15b349ce59425c319165505bda8298a6c.tar.gz raylib-5ae2c0d15b349ce59425c319165505bda8298a6c.zip | |
Added Wayland support
Updated to latest GLFW library and working on Wayland support, still
looking how to implement it on raylib because it just exposes
PLATFORM_DESKTOP and defaults to X11 windowing system on Linux...
Diffstat (limited to 'src/rglfw.c')
| -rw-r--r-- | src/rglfw.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/rglfw.c b/src/rglfw.c index 6518a442..0b577e3a 100644 --- a/src/rglfw.c +++ b/src/rglfw.c @@ -34,7 +34,9 @@ #define _GLFW_WIN32 #endif #ifdef __linux__ - #define _GLFW_X11 + #ifndef _GLFW_WAYLAND // Required for Wayland windowing + #define _GLFW_X11 + #endif #endif #ifdef __FreeBSD__ #define _GLFW_X11 @@ -68,14 +70,24 @@ #endif #ifdef __linux__ - #include "external/glfw/src/x11_init.c" - #include "external/glfw/src/x11_monitor.c" - #include "external/glfw/src/x11_window.c" - #include "external/glfw/src/xkb_unicode.c" + #ifdef _GLFW_WAYLAND + #include "external/glfw/src/wl_init.c" + #include "external/glfw/src/wl_monitor.c" + #include "external/glfw/src/wl_window.c" + #include "external/glfw/src/wayland-pointer-constraints-unstable-v1-client-protocol.c" + #include "external/glfw/src/wayland-relative-pointer-unstable-v1-client-protocol.c" + #endif + #ifdef _GLFW_X11 + #include "external/glfw/src/x11_init.c" + #include "external/glfw/src/x11_monitor.c" + #include "external/glfw/src/x11_window.c" + #include "external/glfw/src/glx_context.c" + #endif + #include "external/glfw/src/linux_joystick.c" - #include "external/glfw/src/posix_time.c" #include "external/glfw/src/posix_thread.c" - #include "external/glfw/src/glx_context.c" + #include "external/glfw/src/posix_time.c" + #include "external/glfw/src/xkb_unicode.c" #include "external/glfw/src/egl_context.c" #include "external/glfw/src/osmesa_context.c" #endif |