From 7493bbe0c81df30c8126b3e6abe3163fbad703b4 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 9 Sep 2012 19:33:40 +0200 Subject: [PATCH] Removed X11 prefix from EGL and GLX files. --- src/CMakeLists.txt | 14 +++++++------- src/{x11_egl_opengl.c => egl_opengl.c} | 0 src/{x11_egl_platform.h => egl_platform.h} | 0 src/{x11_glx_opengl.c => glx_opengl.c} | 0 src/{x11_glx_platform.h => glx_platform.h} | 0 src/x11_platform.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/{x11_egl_opengl.c => egl_opengl.c} (100%) rename src/{x11_egl_platform.h => egl_platform.h} (100%) rename src/{x11_glx_opengl.c => glx_opengl.c} (100%) rename src/{x11_glx_platform.h => glx_platform.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4c31f39e..044ebbd3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,16 +21,16 @@ elseif (_GLFW_WIN32_WGL) win32_native.c win32_opengl.c win32_time.c win32_window.c win32_dllmain.c) elseif (_GLFW_X11_GLX) - set(glfw_HEADERS ${common_HEADERS} x11_platform.h) - set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_fullscreen.c - x11_gamma.c x11_glx_opengl.c x11_init.c x11_input.c + set(glfw_HEADERS ${common_HEADERS} x11_platform.h glx_platform.h) + set(glfw_SOURCES ${common_SOURCES} glx_opengl.c x11_clipboard.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_window.c) elseif (_GLFW_X11_EGL) - set(glfw_HEADERS ${common_HEADERS} x11_egl_platform.h) - set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_fullscreen.c - x11_gamma.c x11_init.c x11_input.c x11_joystick.c - x11_keysym2unicode.c x11_egl_opengl.c x11_time.c + set(glfw_HEADERS ${common_HEADERS} x11_platform.h egl_platform.h) + set(glfw_SOURCES ${common_SOURCES} egl_opengl.c x11_clipboard.c + x11_fullscreen.c x11_gamma.c x11_init.c x11_input.c + x11_joystick.c x11_keysym2unicode.c x11_time.c x11_window.c) endif() diff --git a/src/x11_egl_opengl.c b/src/egl_opengl.c similarity index 100% rename from src/x11_egl_opengl.c rename to src/egl_opengl.c diff --git a/src/x11_egl_platform.h b/src/egl_platform.h similarity index 100% rename from src/x11_egl_platform.h rename to src/egl_platform.h diff --git a/src/x11_glx_opengl.c b/src/glx_opengl.c similarity index 100% rename from src/x11_glx_opengl.c rename to src/glx_opengl.c diff --git a/src/x11_glx_platform.h b/src/glx_platform.h similarity index 100% rename from src/x11_glx_platform.h rename to src/glx_platform.h diff --git a/src/x11_platform.h b/src/x11_platform.h index edb58315..ff21eaf5 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -55,12 +55,12 @@ #if defined(_GLFW_X11_GLX) #define _GLFW_X11_CONTEXT_VISUAL window->GLX.visual - #include "x11_glx_platform.h" + #include "glx_platform.h" #elif defined(_GLFW_X11_EGL) #define _GLFW_X11_CONTEXT_VISUAL window->EGL.visual #define _GLFW_EGL_NATIVE_WINDOW window->X11.handle #define _GLFW_EGL_NATIVE_DISPLAY _glfwLibrary.X11.display - #include "x11_egl_platform.h" + #include "egl_platform.h" #endif #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowX11 X11