[clutter/clutter-1.16] deprecated: Disable Cogl deprecation warnings
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.16] deprecated: Disable Cogl deprecation warnings
- Date: Wed, 3 Jul 2013 17:44:13 +0000 (UTC)
commit 5cc7a1ee57945acd13c2425fa469db33121e5207
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Jul 3 18:15:31 2013 +0100
deprecated: Disable Cogl deprecation warnings
Like we do for Clutter: we know we are using deprecated API.
clutter/deprecated/clutter-rectangle.c | 1 +
clutter/deprecated/clutter-shader.c | 1 +
clutter/deprecated/clutter-texture.c | 7 ++++---
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/clutter/deprecated/clutter-rectangle.c b/clutter/deprecated/clutter-rectangle.c
index 0565658..b02be1f 100644
--- a/clutter/deprecated/clutter-rectangle.c
+++ b/clutter/deprecated/clutter-rectangle.c
@@ -36,6 +36,7 @@
#include "config.h"
#endif
+#define COGL_DISABLE_DEPRECATION_WARNINGS
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-rectangle.h"
#include "deprecated/clutter-actor.h"
diff --git a/clutter/deprecated/clutter-shader.c b/clutter/deprecated/clutter-shader.c
index 8e50c88..fca5963 100644
--- a/clutter/deprecated/clutter-shader.c
+++ b/clutter/deprecated/clutter-shader.c
@@ -52,6 +52,7 @@
#include <unistd.h>
#endif
+#define COGL_DISABLE_DEPRECATION_WARNINGS
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include <glib.h>
diff --git a/clutter/deprecated/clutter-texture.c b/clutter/deprecated/clutter-texture.c
index 8d99523..3ded241 100644
--- a/clutter/deprecated/clutter-texture.c
+++ b/clutter/deprecated/clutter-texture.c
@@ -47,6 +47,10 @@
#include "config.h"
#endif
+/* sadly, we are still using ClutterShader internally */
+#define COGL_DISABLE_DEPRECATION_WARNINGS
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
/* This file depends on the glib enum types which aren't exposed
* by cogl.h when COGL_ENABLE_EXPERIMENTAL_2_0_API is defined.
*
@@ -58,9 +62,6 @@
#define CLUTTER_ENABLE_EXPERIMENTAL_API
-/* sadly, we are still using ClutterShader internally */
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
#include "clutter-texture.h"
#include "clutter-actor-private.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]