mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-09-19 21:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix source list for -Wdeclaration-after-statement

Browse Source 
The context creation files were not included on platforms other than
Win32.
This commit is contained in:
Camilla Löwy 2019-11-27 17:58:05 +01:00
parent dff6253ca7
commit 9486ec0c02
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/CMakeLists.txt
View File

@ -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})

31
src/egl_context.c
View File

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