diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2012-06-20 19:44:41 +0200 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2012-06-20 19:53:18 +0200 |
| commit | 7123c9d94538a616ca4b59aa9aca0f16b8dbc566 (patch) | |
| tree | bbd8aa9e268f654baa8e4139547d66785710b857 | |
| parent | d7d3ec3bf7f9a096d239cade89e306518d564bf3 (diff) | |
| download | cogl-7123c9d94538a616ca4b59aa9aca0f16b8dbc566.tar.gz | |
Mass rename CLUTTER_COMPILATION to COGL_COMPILATION
58 files changed, 61 insertions, 61 deletions
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 9497f277..0e06c48e 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -5,12 +5,12 @@ <GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
<CoglApiVersion>1.0</CoglApiVersion>
<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>
<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>
<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>
<DoDefinesSDL>
if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index ef4de04f..439fbff2 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -36,7 +36,7 @@ />
<UserMacro
Name="LibBuildDefines"
- Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)"
+ Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"
/>
<UserMacro
Name="ReleaseLibBuildDefines"
@@ -56,7 +56,7 @@ />
<UserMacro
Name="TestProgDef"
- Value="CLUTTER_COMPILATION;TESTS_DATADIR=\"../share/cogl-$(CoglApiVersion)/tests\""
+ Value="COGL_COMPILATION;TESTS_DATADIR=\"../share/cogl-$(CoglApiVersion)/tests\""
/>
<UserMacro
Name="DoDefinesSDL"
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am index b49562f1..8a59a2cf 100644 --- a/cogl-pango/Makefile.am +++ b/cogl-pango/Makefile.am @@ -37,7 +37,7 @@ libcogl_pango_la_LDFLAGS = \ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ INCLUDES = \ - -DCLUTTER_COMPILATION \ + -DCOGL_COMPILATION \ -DG_LOG_DOMAIN=\"CoglPango\" \ -I$(top_srcdir)/cogl \ -I$(top_builddir)/cogl \ diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 0027be58..59c622ae 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -25,7 +25,7 @@ INCLUDES = \ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Cogl\" \ - -DCLUTTER_COMPILATION \ + -DCOGL_COMPILATION \ -DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \ -DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \ -DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \ diff --git a/cogl/cogl-attribute-buffer.h b/cogl/cogl-attribute-buffer.h index 492ba210..04ee2bae 100644 --- a/cogl/cogl-attribute-buffer.h +++ b/cogl/cogl-attribute-buffer.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-attribute.h b/cogl/cogl-attribute.h index b59402cb..74a0ddec 100644 --- a/cogl/cogl-attribute.h +++ b/cogl/cogl-attribute.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-bitmap.h b/cogl/cogl-bitmap.h index e2e2962c..fdf2f530 100644 --- a/cogl/cogl-bitmap.h +++ b/cogl/cogl-bitmap.h @@ -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." #endif diff --git a/cogl/cogl-buffer.h b/cogl/cogl-buffer.h index ffd89685..d1f11e8a 100644 --- a/cogl/cogl-buffer.h +++ b/cogl/cogl-buffer.h @@ -25,7 +25,7 @@ * 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." #endif diff --git a/cogl/cogl-clip-state.h b/cogl/cogl-clip-state.h index b51943f4..70cb63bf 100644 --- a/cogl/cogl-clip-state.h +++ b/cogl/cogl-clip-state.h @@ -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." #endif diff --git a/cogl/cogl-clutter-xlib.h b/cogl/cogl-clutter-xlib.h index 766ceba5..6c08f580 100644 --- a/cogl/cogl-clutter-xlib.h +++ b/cogl/cogl-clutter-xlib.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl-clutter.h b/cogl/cogl-clutter.h index 3125db83..2b068a9a 100644 --- a/cogl/cogl-clutter.h +++ b/cogl/cogl-clutter.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl-color.h b/cogl/cogl-color.h index 7ca7cb64..c70673e1 100644 --- a/cogl/cogl-color.h +++ b/cogl/cogl-color.h @@ -31,7 +31,7 @@ * 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." #endif diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h index 51a435fd..a12e9501 100644 --- a/cogl/cogl-context.h +++ b/cogl/cogl-context.h @@ -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." #endif diff --git a/cogl/cogl-defines.h.in b/cogl/cogl-defines.h.in index 3d4b17d2..12253abe 100644 --- a/cogl/cogl-defines.h.in +++ b/cogl/cogl-defines.h.in @@ -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." #endif diff --git a/cogl/cogl-defines.h.win32 b/cogl/cogl-defines.h.win32 index 75a70bac..ded14743 100644 --- a/cogl/cogl-defines.h.win32 +++ b/cogl/cogl-defines.h.win32 @@ -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." #endif diff --git a/cogl/cogl-defines.h.win32_SDL b/cogl/cogl-defines.h.win32_SDL index 5141857a..d9d77ddb 100644 --- a/cogl/cogl-defines.h.win32_SDL +++ b/cogl/cogl-defines.h.win32_SDL @@ -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." #endif diff --git a/cogl/cogl-depth-state.h b/cogl/cogl-depth-state.h index 0fff9a05..49bf67df 100644 --- a/cogl/cogl-depth-state.h +++ b/cogl/cogl-depth-state.h @@ -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." #endif diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h index d4d47359..5984aa11 100644 --- a/cogl/cogl-display.h +++ b/cogl/cogl-display.h @@ -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." #endif diff --git a/cogl/cogl-euler.h b/cogl/cogl-euler.h index e82eab16..94428460 100644 --- a/cogl/cogl-euler.h +++ b/cogl/cogl-euler.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-fixed.h b/cogl/cogl-fixed.h index 5d7e5671..009ad7b2 100644 --- a/cogl/cogl-fixed.h +++ b/cogl/cogl-fixed.h @@ -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." #endif diff --git a/cogl/cogl-gl-header.h b/cogl/cogl-gl-header.h index a3f44b1f..c47d901e 100644 --- a/cogl/cogl-gl-header.h +++ b/cogl/cogl-gl-header.h @@ -21,7 +21,7 @@ * */ -#if !defined(CLUTTER_COMPILATION) +#if !defined(COGL_COMPILATION) #error "cogl-gl-header.h should only be included when compiling Cogl" #endif diff --git a/cogl/cogl-gles2.h b/cogl/cogl-gles2.h index a6334b69..87cc5235 100644 --- a/cogl/cogl-gles2.h +++ b/cogl/cogl-gles2.h @@ -43,7 +43,7 @@ * conflicts we only expose the minimal set of GLES 2.0 types and enums * publicly. */ -#ifdef CLUTTER_COMPILATION +#ifdef COGL_COMPILATION #include "cogl-gl-header.h" #else #include <cogl/cogl-gles2-types.h> diff --git a/cogl/cogl-glib-source.h b/cogl/cogl-glib-source.h index 6bd5dd46..1ce7d7e7 100644 --- a/cogl/cogl-glib-source.h +++ b/cogl/cogl-glib-source.h @@ -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." #endif diff --git a/cogl/cogl-index-buffer.h b/cogl/cogl-index-buffer.h index 2e64ab35..5c2358f7 100644 --- a/cogl/cogl-index-buffer.h +++ b/cogl/cogl-index-buffer.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-indices.h b/cogl/cogl-indices.h index 23cc9115..1133ddb7 100644 --- a/cogl/cogl-indices.h +++ b/cogl/cogl-indices.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-kms-renderer.h b/cogl/cogl-kms-renderer.h index 68d126eb..539fa788 100644 --- a/cogl/cogl-kms-renderer.h +++ b/cogl/cogl-kms-renderer.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl-material-compat.h b/cogl/cogl-material-compat.h index f07bb692..8ae3c610 100644 --- a/cogl/cogl-material-compat.h +++ b/cogl/cogl-material-compat.h @@ -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." #endif diff --git a/cogl/cogl-meta-texture.h b/cogl/cogl-meta-texture.h index dca9f5e6..b896cd0e 100644 --- a/cogl/cogl-meta-texture.h +++ b/cogl/cogl-meta-texture.h @@ -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." #endif diff --git a/cogl/cogl-offscreen.h b/cogl/cogl-offscreen.h index 47298bd4..b8b16ff3 100644 --- a/cogl/cogl-offscreen.h +++ b/cogl/cogl-offscreen.h @@ -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." #endif diff --git a/cogl/cogl-onscreen-template.h b/cogl/cogl-onscreen-template.h index 64d9b74c..cd531d36 100644 --- a/cogl/cogl-onscreen-template.h +++ b/cogl/cogl-onscreen-template.h @@ -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." #endif diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h index 9d150b25..53ae8a0c 100644 --- a/cogl/cogl-onscreen.h +++ b/cogl/cogl-onscreen.h @@ -25,7 +25,7 @@ * 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." #endif diff --git a/cogl/cogl-path-functions.h b/cogl/cogl-path-functions.h index 2566fe18..c5413fbc 100644 --- a/cogl/cogl-path-functions.h +++ b/cogl/cogl-path-functions.h @@ -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." #endif diff --git a/cogl/cogl-path.h b/cogl/cogl-path.h index c3d0d450..b29fdeef 100644 --- a/cogl/cogl-path.h +++ b/cogl/cogl-path.h @@ -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." #endif diff --git a/cogl/cogl-pipeline-layer-state.h b/cogl/cogl-pipeline-layer-state.h index bfe04833..a2cae84f 100644 --- a/cogl/cogl-pipeline-layer-state.h +++ b/cogl/cogl-pipeline-layer-state.h @@ -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." #endif diff --git a/cogl/cogl-pipeline-state.h b/cogl/cogl-pipeline-state.h index 86866294..0795c781 100644 --- a/cogl/cogl-pipeline-state.h +++ b/cogl/cogl-pipeline-state.h @@ -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." #endif diff --git a/cogl/cogl-pipeline.h b/cogl/cogl-pipeline.h index d990e244..cacf4467 100644 --- a/cogl/cogl-pipeline.h +++ b/cogl/cogl-pipeline.h @@ -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." #endif diff --git a/cogl/cogl-pixel-buffer.h b/cogl/cogl-pixel-buffer.h index 49bd603a..1cd03465 100644 --- a/cogl/cogl-pixel-buffer.h +++ b/cogl/cogl-pixel-buffer.h @@ -25,7 +25,7 @@ * 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." #endif diff --git a/cogl/cogl-poll.h b/cogl/cogl-poll.h index 9c520b63..306fdb39 100644 --- a/cogl/cogl-poll.h +++ b/cogl/cogl-poll.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-primitive.h b/cogl/cogl-primitive.h index 134bb87c..13be5f8f 100644 --- a/cogl/cogl-primitive.h +++ b/cogl/cogl-primitive.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-quaternion.h b/cogl/cogl-quaternion.h index eb60bcd0..2d956f92 100644 --- a/cogl/cogl-quaternion.h +++ b/cogl/cogl-quaternion.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h index 6ad95fb9..74c7cd94 100644 --- a/cogl/cogl-renderer.h +++ b/cogl/cogl-renderer.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl-shader.h b/cogl/cogl-shader.h index c9aad74d..9ec80c61 100644 --- a/cogl/cogl-shader.h +++ b/cogl/cogl-shader.h @@ -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." #endif diff --git a/cogl/cogl-snippet.h b/cogl/cogl-snippet.h index 88a49d26..6fcd94fd 100644 --- a/cogl/cogl-snippet.h +++ b/cogl/cogl-snippet.h @@ -25,7 +25,7 @@ * 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." #endif diff --git a/cogl/cogl-sub-texture.h b/cogl/cogl-sub-texture.h index 6dae9ae8..8367b7e7 100644 --- a/cogl/cogl-sub-texture.h +++ b/cogl/cogl-sub-texture.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-swap-chain.h b/cogl/cogl-swap-chain.h index 04209354..aaffaf81 100644 --- a/cogl/cogl-swap-chain.h +++ b/cogl/cogl-swap-chain.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl-texture-2d.h b/cogl/cogl-texture-2d.h index f191924e..9835225b 100644 --- a/cogl/cogl-texture-2d.h +++ b/cogl/cogl-texture-2d.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-texture-3d.h b/cogl/cogl-texture-3d.h index 6c14912b..17fbd1d1 100644 --- a/cogl/cogl-texture-3d.h +++ b/cogl/cogl-texture-3d.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h index 4eeffb58..9c96d794 100644 --- a/cogl/cogl-texture.h +++ b/cogl/cogl-texture.h @@ -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." #endif diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h index 28e3f1e0..ece5c330 100644 --- a/cogl/cogl-types.h +++ b/cogl/cogl-types.h @@ -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." #endif @@ -38,7 +38,7 @@ G_BEGIN_DECLS 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 don't accidentally access private members */ -#ifdef CLUTTER_COMPILATION +#ifdef COGL_COMPILATION #define COGL_PRIVATE(x) x #else #define COGL_PRIVATE(x) private_member_ ## x diff --git a/cogl/cogl-vector.h b/cogl/cogl-vector.h index c6824d65..78bcbe03 100644 --- a/cogl/cogl-vector.h +++ b/cogl/cogl-vector.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-vertex-buffer.h b/cogl/cogl-vertex-buffer.h index 631ba099..8fc358fe 100644 --- a/cogl/cogl-vertex-buffer.h +++ b/cogl/cogl-vertex-buffer.h @@ -24,7 +24,7 @@ * 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." #endif diff --git a/cogl/cogl-wayland-renderer.h b/cogl/cogl-wayland-renderer.h index 68fa7743..f5a760f7 100644 --- a/cogl/cogl-wayland-renderer.h +++ b/cogl/cogl-wayland-renderer.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl-win32-renderer.h b/cogl/cogl-win32-renderer.h index 3b265936..2bf06a19 100644 --- a/cogl/cogl-win32-renderer.h +++ b/cogl/cogl-win32-renderer.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl-xlib-renderer.h b/cogl/cogl-xlib-renderer.h index c22d2e53..7a031060 100644 --- a/cogl/cogl-xlib-renderer.h +++ b/cogl/cogl-xlib-renderer.h @@ -21,7 +21,7 @@ * 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." #endif diff --git a/cogl/cogl1-context.h b/cogl/cogl1-context.h index c59bd691..9acd66ae 100644 --- a/cogl/cogl1-context.h +++ b/cogl/cogl1-context.h @@ -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." #endif diff --git a/cogl/cogl2-compatibility.h b/cogl/cogl2-compatibility.h index 3c9f979a..4707787a 100644 --- a/cogl/cogl2-compatibility.h +++ b/cogl/cogl2-compatibility.h @@ -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." #endif diff --git a/cogl/cogl2-path.h b/cogl/cogl2-path.h index f702c4a8..fe57eafa 100644 --- a/cogl/cogl2-path.h +++ b/cogl/cogl2-path.h @@ -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." #endif diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 306917fe..5898db24 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -112,7 +112,7 @@ test_conformance_CPPFLAGS = \ -DCOGL_ENABLE_EXPERIMENTAL_API \ -DCOGL_DISABLE_DEPRECATED \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ - -DCLUTTER_COMPILATION + -DCOGL_COMPILATION test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la |