rename winsys files to be more consistent

This tries to make the naming style of files under cogl/winsys/
consistent with other cogl source files. In particular private header
files didn't have a '-private' infix.
This commit is contained in:
Robert Bragg 2011-02-22 20:08:16 +00:00
parent 532b563439
commit a90862929b
11 changed files with 15 additions and 15 deletions

View File

@ -110,7 +110,7 @@ endif # COGL_DRIVER_GLES
# winsys sources, common to all backends # winsys sources, common to all backends
cogl_winsys_common_sources = \ cogl_winsys_common_sources = \
$(srcdir)/winsys/cogl-winsys.h \ $(srcdir)/winsys/cogl-winsys-private.h \
$(srcdir)/winsys/cogl-context-winsys.h \ $(srcdir)/winsys/cogl-context-winsys.h \
$(srcdir)/winsys/cogl-context-winsys.c \ $(srcdir)/winsys/cogl-context-winsys.c \
$(srcdir)/winsys/cogl-winsys-feature-functions.h \ $(srcdir)/winsys/cogl-winsys-feature-functions.h \
@ -282,42 +282,42 @@ cogl_experimental_h += \
$(srcdir)/winsys/cogl-texture-pixmap-x11.h $(srcdir)/winsys/cogl-texture-pixmap-x11.h
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-xlib.h \ $(srcdir)/winsys/cogl-winsys-xlib.h \
$(srcdir)/winsys/cogl-xlib.c \ $(srcdir)/winsys/cogl-winsys-xlib.c \
$(srcdir)/winsys/cogl-texture-pixmap-x11.c \ $(srcdir)/winsys/cogl-texture-pixmap-x11.c \
$(srcdir)/winsys/cogl-texture-pixmap-x11-private.h $(srcdir)/winsys/cogl-texture-pixmap-x11-private.h
endif endif
if SUPPORT_GLX if SUPPORT_GLX
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-glx.c $(srcdir)/winsys/cogl-winsys-glx.c
endif endif
if SUPPORT_EGL_PLATFORM_POWERVR_X11 if SUPPORT_EGL_PLATFORM_POWERVR_X11
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-egl.c $(srcdir)/winsys/cogl-winsys-egl.c
endif endif
if SUPPORT_EGL_PLATFORM_POWERVR_NULL if SUPPORT_EGL_PLATFORM_POWERVR_NULL
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-egl.c $(srcdir)/winsys/cogl-winsys-egl.c
endif endif
if SUPPORT_EGL_PLATFORM_POWERVR_GDL if SUPPORT_EGL_PLATFORM_POWERVR_GDL
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-egl.c $(srcdir)/winsys/cogl-winsys-egl.c
endif endif
if SUPPORT_EGL_PLATFORM_FRUITY if SUPPORT_EGL_PLATFORM_FRUITY
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-fruity.c $(srcdir)/winsys/cogl-winsys-fruity.c
endif endif
if SUPPORT_EGL_PLATFORM_DRM_SURFACELESS if SUPPORT_EGL_PLATFORM_DRM_SURFACELESS
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-egl.c $(srcdir)/winsys/cogl-winsys-egl.c
endif endif
if SUPPORT_WIN32 if SUPPORT_WIN32
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-win32.c $(srcdir)/winsys/cogl-winsys-win32.c
endif endif
if SUPPORT_OSX if SUPPORT_OSX
cogl_sources_c += \ cogl_sources_c += \
$(srcdir)/winsys/cogl-osx.c $(srcdir)/winsys/cogl-winsys-osx.c
endif endif
EXTRA_DIST += stb_image.c EXTRA_DIST += stb_image.c

View File

@ -42,7 +42,7 @@
#include "cogl-texture-rectangle-private.h" #include "cogl-texture-rectangle-private.h"
#include "cogl-context-private.h" #include "cogl-context-private.h"
#include "cogl-handle.h" #include "cogl-handle.h"
#include "cogl-xlib.h" #include "cogl-winsys-xlib.h"
#include "cogl-pipeline-opengl-private.h" #include "cogl-pipeline-opengl-private.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>

View File

@ -21,10 +21,10 @@
* *
*/ */
#ifndef __COGL_WINSYS_H #ifndef __COGL_WINSYS_PRIVATE_H
#define __COGL_WINSYS_H #define __COGL_WINSYS_PRIVATE_H
CoglFuncPtr CoglFuncPtr
_cogl_winsys_get_proc_address (const char *name); _cogl_winsys_get_proc_address (const char *name);
#endif /* __COGL_WINSYS_H */ #endif /* __COGL_WINSYS_PRIVATE_H */