[clutter/clutter-1.16] Add COGL_DISABLE_DEPRECATION_WARNINGS to the build flags
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.16] Add COGL_DISABLE_DEPRECATION_WARNINGS to the build flags
- Date: Wed, 10 Jul 2013 12:53:58 +0000 (UTC)
commit fa8809d716f3c96966f510f607f9c318faea5a48
Author: Neil Roberts <neil linux intel com>
Date: Tue Jul 9 16:08:53 2013 +0100
Add COGL_DISABLE_DEPRECATION_WARNINGS to the build flags
Cogl 1.16 has deprecated a lot of API which it will be difficult for
Clutter to catch up with. For the time being the warnings are just
being disabled to keep the build output clean.
https://bugzilla.gnome.org/show_bug.cgi?id=703877
clutter/Makefile.am | 1 +
clutter/deprecated/clutter-rectangle.c | 1 -
clutter/deprecated/clutter-shader.c | 1 -
clutter/deprecated/clutter-texture.c | 1 -
4 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index e8d8807..b035548 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
-DCLUTTER_SYSCONFDIR=\""$(sysconfdir)"\" \
-DCLUTTER_COMPILATION=1 \
-DCOGL_ENABLE_EXPERIMENTAL_API \
+ -DCOGL_DISABLE_DEPRECATION_WARNINGS \
-DG_LOG_DOMAIN=\"Clutter\" \
-I$(top_srcdir) \
-I$(top_srcdir)/clutter \
diff --git a/clutter/deprecated/clutter-rectangle.c b/clutter/deprecated/clutter-rectangle.c
index b02be1f..0565658 100644
--- a/clutter/deprecated/clutter-rectangle.c
+++ b/clutter/deprecated/clutter-rectangle.c
@@ -36,7 +36,6 @@
#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 fca5963..8e50c88 100644
--- a/clutter/deprecated/clutter-shader.c
+++ b/clutter/deprecated/clutter-shader.c
@@ -52,7 +52,6 @@
#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 3ded241..8ed593d 100644
--- a/clutter/deprecated/clutter-texture.c
+++ b/clutter/deprecated/clutter-texture.c
@@ -48,7 +48,6 @@
#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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]