mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed X11 prefix from EGL and GLX files.

Browse Source
This commit is contained in:
Camilla Berglund 2012-09-09 19:33:40 +02:00
parent 74488bec67
commit 7493bbe0c8
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CMakeLists.txt
View File

@ -21,16 +21,16 @@ elseif (_GLFW_WIN32_WGL)
win32_native.c win32_opengl.c win32_time.c win32_window.c win32_native.c win32_opengl.c win32_time.c win32_window.c
win32_dllmain.c) win32_dllmain.c)
elseif (_GLFW_X11_GLX) elseif (_GLFW_X11_GLX)
set(glfw_HEADERS ${common_HEADERS} x11_platform.h) set(glfw_HEADERS ${common_HEADERS} x11_platform.h glx_platform.h)
set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_fullscreen.c set(glfw_SOURCES ${common_SOURCES} glx_opengl.c x11_clipboard.c
x11_gamma.c x11_glx_opengl.c x11_init.c x11_input.c x11_fullscreen.c x11_gamma.c x11_init.c x11_input.c
x11_joystick.c x11_keysym2unicode.c x11_native.c x11_time.c x11_joystick.c x11_keysym2unicode.c x11_native.c x11_time.c
x11_window.c) x11_window.c)
elseif (_GLFW_X11_EGL) elseif (_GLFW_X11_EGL)
set(glfw_HEADERS ${common_HEADERS} x11_egl_platform.h) set(glfw_HEADERS ${common_HEADERS} x11_platform.h egl_platform.h)
set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_fullscreen.c set(glfw_SOURCES ${common_SOURCES} egl_opengl.c x11_clipboard.c
x11_gamma.c x11_init.c x11_input.c x11_joystick.c x11_fullscreen.c x11_gamma.c x11_init.c x11_input.c
x11_keysym2unicode.c x11_egl_opengl.c x11_time.c x11_joystick.c x11_keysym2unicode.c x11_time.c
x11_window.c) x11_window.c)
endif() endif()

0
src/x11_egl_opengl.c → src/egl_opengl.c
View File

0
src/x11_egl_platform.h → src/egl_platform.h
View File

0
src/x11_glx_opengl.c → src/glx_opengl.c
View File

0
src/x11_glx_platform.h → src/glx_platform.h
View File

4
src/x11_platform.h
View File

@ -55,12 +55,12 @@
#if defined(_GLFW_X11_GLX) #if defined(_GLFW_X11_GLX)
#define _GLFW_X11_CONTEXT_VISUAL window->GLX.visual #define _GLFW_X11_CONTEXT_VISUAL window->GLX.visual
#include "x11_glx_platform.h" #include "glx_platform.h"
#elif defined(_GLFW_X11_EGL) #elif defined(_GLFW_X11_EGL)
#define _GLFW_X11_CONTEXT_VISUAL window->EGL.visual #define _GLFW_X11_CONTEXT_VISUAL window->EGL.visual
#define _GLFW_EGL_NATIVE_WINDOW window->X11.handle #define _GLFW_EGL_NATIVE_WINDOW window->X11.handle
#define _GLFW_EGL_NATIVE_DISPLAY _glfwLibrary.X11.display #define _GLFW_EGL_NATIVE_DISPLAY _glfwLibrary.X11.display
#include "x11_egl_platform.h" #include "egl_platform.h"
#endif #endif
#define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowX11 X11 #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowX11 X11