Fix source list for -Wdeclaration-after-statement

The context creation files were not included on platforms other than
Win32.
master
Camilla Löwy ago%!(EXTRA string=6 years)
parent dff6253ca7
commit 9486ec0c02
  1. 13
      src/CMakeLists.txt
  2. 29
      src/egl_context.c

@ -83,13 +83,12 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
if (WIN32) set_source_files_properties(context.c init.c input.c monitor.c vulkan.c
set(windows_SOURCES ${glfw_SOURCES}) window.c win32_init.c win32_joystick.c
else() win32_monitor.c win32_time.c win32_thread.c
set(windows_SOURCES ${common_SOURCES}) win32_window.c wgl_context.c egl_context.c
endif() osmesa_context.c PROPERTIES
set_source_files_properties(${windows_SOURCES} PROPERTIES COMPILE_FLAGS -Wdeclaration-after-statement)
COMPILE_FLAGS -Wdeclaration-after-statement)
endif() endif()
add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS}) add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})

@ -123,23 +123,24 @@ static GLFWbool chooseEGLConfig(const _GLFWctxconfig* ctxconfig,
continue; continue;
#if defined(_GLFW_X11) #if defined(_GLFW_X11)
XVisualInfo vi = {0}; {
XVisualInfo vi = {0};
// Only consider EGLConfigs with associated Visuals // Only consider EGLConfigs with associated Visuals
vi.visualid = getEGLConfigAttrib(n, EGL_NATIVE_VISUAL_ID); vi.visualid = getEGLConfigAttrib(n, EGL_NATIVE_VISUAL_ID);
if (!vi.visualid) if (!vi.visualid)
continue; continue;
if (desired->transparent) if (desired->transparent)
{
int count;
XVisualInfo* vis = XGetVisualInfo(_glfw.x11.display,
VisualIDMask, &vi,
&count);
if (vis)
{ {
u->transparent = _glfwIsVisualTransparentX11(vis[0].visual); int count;
XFree(vis); XVisualInfo* vis =
XGetVisualInfo(_glfw.x11.display, VisualIDMask, &vi, &count);
if (vis)
{
u->transparent = _glfwIsVisualTransparentX11(vis[0].visual);
XFree(vis);
}
} }
} }
#endif // _GLFW_X11 #endif // _GLFW_X11

Loading…
Cancel
Save