shell: Define COGL_ENABLE_EXPERIMENTAL_API and related defines globally
This allows us to use new Cogl APIs without having to define things in every .c/.h file manually.
This commit is contained in:
parent
d836194e31
commit
3df7ef6ce6
@ -4,6 +4,8 @@ st_cflags = \
|
|||||||
-DLIBDIR=\""$(libdir)"\" \
|
-DLIBDIR=\""$(libdir)"\" \
|
||||||
-DG_LOG_DOMAIN=\"St\" \
|
-DG_LOG_DOMAIN=\"St\" \
|
||||||
-DST_COMPILATION \
|
-DST_COMPILATION \
|
||||||
|
-DCLUTTER_ENABLE_EXPERIMENTAL_API \
|
||||||
|
-DCOGL_ENABLE_EXPERIMENTAL_API \
|
||||||
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
|
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
|
||||||
$(ST_CFLAGS) \
|
$(ST_CFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -61,6 +61,8 @@ include Makefile-hotplug-sniffer.am
|
|||||||
gnome_shell_cflags = \
|
gnome_shell_cflags = \
|
||||||
$(GNOME_SHELL_CFLAGS) \
|
$(GNOME_SHELL_CFLAGS) \
|
||||||
-I$(srcdir)/tray \
|
-I$(srcdir)/tray \
|
||||||
|
-DCLUTTER_ENABLE_EXPERIMENTAL_API \
|
||||||
|
-DCOGL_ENABLE_EXPERIMENTAL_API \
|
||||||
-DVERSION=\"$(VERSION)\" \
|
-DVERSION=\"$(VERSION)\" \
|
||||||
-DLOCALEDIR=\"$(datadir)/locale\" \
|
-DLOCALEDIR=\"$(datadir)/locale\" \
|
||||||
-DDATADIR=\"$(datadir)\" \
|
-DDATADIR=\"$(datadir)\" \
|
||||||
|
@ -26,8 +26,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#define CLUTTER_ENABLE_EXPERIMENTAL_API
|
|
||||||
#define COGL_ENABLE_EXPERIMENTAL_API
|
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
#include <clutter/x11/clutter-x11.h>
|
#include <clutter/x11/clutter-x11.h>
|
||||||
#include <gjs/gjs.h>
|
#include <gjs/gjs.h>
|
||||||
|
@ -13,9 +13,6 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#define CLUTTER_ENABLE_EXPERIMENTAL_API
|
|
||||||
#define COGL_ENABLE_EXPERIMENTAL_API
|
|
||||||
|
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include "shell-glsl-quad.h"
|
#include "shell-glsl-quad.h"
|
||||||
|
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
#ifndef __SHELL_INVERT_LIGHTNESS_EFFECT_H__
|
#ifndef __SHELL_INVERT_LIGHTNESS_EFFECT_H__
|
||||||
#define __SHELL_INVERT_LIGHTNESS_EFFECT_H__
|
#define __SHELL_INVERT_LIGHTNESS_EFFECT_H__
|
||||||
|
|
||||||
#define COGL_ENABLE_EXPERIMENTAL_API
|
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||||
|
|
||||||
#define COGL_ENABLE_EXPERIMENTAL_API
|
|
||||||
#define CLUTTER_ENABLE_EXPERIMENTAL_API
|
|
||||||
|
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include <meta/display.h>
|
#include <meta/display.h>
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#define COGL_ENABLE_EXPERIMENTAL_API /* for cogl_framebuffer_allocate */
|
|
||||||
|
|
||||||
#include "st-texture-cache.h"
|
#include "st-texture-cache.h"
|
||||||
#include "st-private.h"
|
#include "st-private.h"
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user