Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pirvi-public
glfw
Commits
0e0862cf
Commit
0e0862cf
authored
Mar 03, 2017
by
Emmanuel Gil Peyrot
Browse files
Wayland: Fix broken build
Regression caused by
e9560ef0
.
parent
5b306f03
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
0e0862cf
...
...
@@ -33,10 +33,11 @@ elseif (_GLFW_X11)
endif
()
elseif
(
_GLFW_WAYLAND
)
set
(
glfw_HEADERS
${
common_HEADERS
}
wl_platform.h linux_joystick.h
posix_time.h posix_tls.h xkb_unicode.h egl_context.h
)
posix_time.h posix_tls.h xkb_unicode.h egl_context.h
osmesa_context.h
)
set
(
glfw_SOURCES
${
common_SOURCES
}
wl_init.c wl_monitor.c wl_window.c
linux_joystick.c posix_time.c posix_tls.c xkb_unicode.c
egl_context.c
)
egl_context.c
osmesa_context.c
)
ecm_add_wayland_client_protocol
(
glfw_SOURCES
PROTOCOL
...
...
src/wl_platform.h
View file @
0e0862cf
...
...
@@ -51,6 +51,7 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR
#include "linux_joystick.h"
#include "xkb_unicode.h"
#include "egl_context.h"
#include "osmesa_context.h"
#include "wayland-relative-pointer-unstable-v1-client-protocol.h"
#include "wayland-pointer-constraints-unstable-v1-client-protocol.h"
...
...
src/wl_window.c
View file @
0e0862cf
...
...
@@ -395,10 +395,21 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
if
(
ctxconfig
->
client
!=
GLFW_NO_API
)
{
if
(
!
_glfwInitEGL
())
return
GLFW_FALSE
;
if
(
!
_glfwCreateContextEGL
(
window
,
ctxconfig
,
fbconfig
))
return
GLFW_FALSE
;
if
(
ctxconfig
->
source
==
GLFW_EGL_CONTEXT_API
||
ctxconfig
->
source
==
GLFW_NATIVE_CONTEXT_API
)
{
if
(
!
_glfwInitEGL
())
return
GLFW_FALSE
;
if
(
!
_glfwCreateContextEGL
(
window
,
ctxconfig
,
fbconfig
))
return
GLFW_FALSE
;
}
else
if
(
ctxconfig
->
source
==
GLFW_OSMESA_CONTEXT_API
)
{
if
(
!
_glfwInitOSMesa
())
return
GLFW_FALSE
;
if
(
!
_glfwCreateContextOSMesa
(
window
,
ctxconfig
,
fbconfig
))
return
GLFW_FALSE
;
}
}
if
(
wndconfig
->
title
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment