brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mass rename CLUTTER_COMPILATION to COGL_COMPILATION

Browse Source 
Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)
This commit is contained in:
Tomeu Vizoso 2012-06-20 19:49:08 +02:00 committed by Robert Bragg
parent 4ad1e9b83a
commit 93d0de1d9a
65 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/win32/vs10/cogl.props
View File

@ -5,12 +5,12 @@
<GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath> <GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
<CoglApiVersion>1.0</CoglApiVersion> <CoglApiVersion>1.0</CoglApiVersion>
<BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines> <BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
<LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines> <LibBuildDefines>HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
<ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines> <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
<DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines> <DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>
<CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines> <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines>
<CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines> <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
<TestProgDef>CLUTTER_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef> <TestProgDef>COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir> <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DoDefinesSDL> <DoDefinesSDL>
if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H

4
build/win32/vs9/cogl.vsprops
View File

@ -36,7 +36,7 @@
/> />
<UserMacro <UserMacro
Name="LibBuildDefines" Name="LibBuildDefines"
Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)" Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"
/> />
<UserMacro <UserMacro
Name="ReleaseLibBuildDefines" Name="ReleaseLibBuildDefines"
@ -56,7 +56,7 @@
/> />
<UserMacro <UserMacro
Name="TestProgDef" Name="TestProgDef"
Value="CLUTTER_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;" Value="COGL_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;"
/> />
<UserMacro <UserMacro
Name="DoDefinesSDL" Name="DoDefinesSDL"

2
cogl-pango/Makefile.am
View File

@ -37,7 +37,7 @@ libcogl_pango_la_LDFLAGS = \
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
INCLUDES = \ INCLUDES = \
-DCLUTTER_COMPILATION \ -DCOGL_COMPILATION \
-DG_LOG_DOMAIN=\"CoglPango\" \ -DG_LOG_DOMAIN=\"CoglPango\" \
-I$(top_srcdir)/cogl \ -I$(top_srcdir)/cogl \
-I$(top_builddir)/cogl \ -I$(top_builddir)/cogl \

2
cogl/Makefile.am
View File

@ -25,7 +25,7 @@ INCLUDES = \
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Cogl\" \ -DG_LOG_DOMAIN=\"Cogl\" \
-DCLUTTER_COMPILATION \ -DCOGL_COMPILATION \
-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \ -DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \ -DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \ -DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \

2
cogl/cogl-attribute-buffer.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-attribute.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-bitmap.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-buffer.h
View File

@ -25,7 +25,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-clip-state.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-clutter-xlib.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl-xlib.h> can be included directly." #error "Only <cogl/cogl-xlib.h> can be included directly."
#endif #endif

2
cogl/cogl-clutter.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-color.h
View File

@ -31,7 +31,7 @@
* Since: 1.0 * Since: 1.0
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-context.h
View File

@ -24,7 +24,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-defines.h.in
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-defines.h.win32.in
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-defines.h.win32_SDL.in
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-depth-state.h
View File

@ -24,7 +24,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-display.h
View File

@ -24,7 +24,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-euler.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-fixed.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-gl-header.h.in
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(CLUTTER_COMPILATION) #if !defined(COGL_COMPILATION)
#error "cogl-gl-header.h should only be included when compiling Cogl" #error "cogl-gl-header.h should only be included when compiling Cogl"
#endif #endif

2
cogl/cogl-gl-header.h.win32
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(CLUTTER_COMPILATION) #if !defined(COGL_COMPILATION)
#error "cogl-gl-header.h should only be included when compiling Cogl" #error "cogl-gl-header.h should only be included when compiling Cogl"
#endif #endif

2
cogl/cogl-gles2.h
View File

@ -43,7 +43,7 @@
* conflicts we only expose the minimal set of GLES 2.0 types and enums * conflicts we only expose the minimal set of GLES 2.0 types and enums
* publicly. * publicly.
*/ */
#ifdef CLUTTER_COMPILATION #ifdef COGL_COMPILATION
#include "cogl-gl-header.h" #include "cogl-gl-header.h"
#else #else
#include <cogl/cogl-gles2-types.h> #include <cogl/cogl-gles2-types.h>

2
cogl/cogl-glib-source.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-index-buffer.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-indices.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-kms-display.h
View File

@ -22,7 +22,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-kms-renderer.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-magazine-private.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-material-compat.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-memory-stack-private.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-meta-texture.h
View File

@ -22,7 +22,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-offscreen.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-onscreen-template.h
View File

@ -24,7 +24,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-onscreen.h
View File

@ -25,7 +25,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-path-functions.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-path.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-pipeline-layer-state.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-pipeline-state.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-pipeline.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-pixel-buffer.h
View File

@ -25,7 +25,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-poll.h
View File

@ -24,7 +24,7 @@
* Neil Roberts <neil@linux.intel.com> * Neil Roberts <neil@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-primitive-texture.h
View File

@ -22,7 +22,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-primitive.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-quaternion.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-renderer.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-sdl.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-shader.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-snippet.h
View File

@ -25,7 +25,7 @@
* Neil Roberts <neil@linux.intel.com> * Neil Roberts <neil@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-sub-texture.h
View File

@ -24,7 +24,7 @@
* Neil Roberts <neil@linux.intel.com> * Neil Roberts <neil@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-swap-chain.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-texture-2d.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-texture-3d.h
View File

@ -24,7 +24,7 @@
* Neil Roberts <neil@linux.intel.com> * Neil Roberts <neil@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-texture.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

4
cogl/cogl-types.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif
@ -77,7 +77,7 @@ typedef int CoglBool;
definitions because we want the size to be public so they can be definitions because we want the size to be public so they can be
allocated on the stack. This macro is used to ensure that users allocated on the stack. This macro is used to ensure that users
don't accidentally access private members */ don't accidentally access private members */
#ifdef CLUTTER_COMPILATION #ifdef COGL_COMPILATION
#define COGL_PRIVATE(x) x #define COGL_PRIVATE(x) x
#else #else
#define COGL_PRIVATE(x) private_member_ ## x #define COGL_PRIVATE(x) private_member_ ## x

2
cogl/cogl-vector.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-vertex-buffer.h
View File

@ -24,7 +24,7 @@
* Robert Bragg <robert@linux.intel.com> * Robert Bragg <robert@linux.intel.com>
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-wayland-renderer.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-win32-renderer.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl-xlib-renderer.h
View File

@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl-xlib.h> can be included directly." #error "Only <cogl/cogl-xlib.h> can be included directly."
#endif #endif

2
cogl/cogl1-context.h
View File

@ -24,7 +24,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl2-compatibility.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
cogl/cogl2-path.h
View File

@ -21,7 +21,7 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly." #error "Only <cogl/cogl.h> can be included directly."
#endif #endif

2
tests/conform/Makefile.am
View File

@ -116,7 +116,7 @@ test_conformance_CPPFLAGS = \
-DCOGL_ENABLE_EXPERIMENTAL_API \ -DCOGL_ENABLE_EXPERIMENTAL_API \
-DCOGL_DISABLE_DEPRECATED \ -DCOGL_DISABLE_DEPRECATED \
-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \
-DCLUTTER_COMPILATION -DCOGL_COMPILATION
test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la

2
tests/conform/test-no-gl-header.c
View File

@ -1,4 +1,4 @@
#undef CLUTTER_COMPILATION #undef COGL_COMPILATION
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include "test-utils.h" #include "test-utils.h"