mirror of
https://github.com/brl/mutter.git
synced 2025-03-03 19:58:10 +00:00
Fix include location for cogl-pango.h
In Cogl, cogl-pango.h has moved to <cogl-pango/cogl-pango.h>. When using the experimental 2.0 API (which Clutter does) it is no longer possible to include it under the old name of <cogl/cogl-pango.h> so we need to update the include location.
This commit is contained in:
parent
07ecaf569f
commit
7d233241f1
@ -110,7 +110,7 @@
|
|||||||
#include "clutter-version.h" /* For flavour define */
|
#include "clutter-version.h" /* For flavour define */
|
||||||
|
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include <cogl/cogl-pango.h>
|
#include <cogl-pango/cogl-pango.h>
|
||||||
|
|
||||||
#include "cally.h" /* For accessibility support */
|
#include "cally.h" /* For accessibility support */
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
#include <glib/gi18n-lib.h>
|
#include <glib/gi18n-lib.h>
|
||||||
|
|
||||||
#include <cogl/cogl-pango.h>
|
#include <cogl-pango/cogl-pango.h>
|
||||||
|
|
||||||
#include "clutter-backend.h"
|
#include "clutter-backend.h"
|
||||||
#include "clutter-effect.h"
|
#include "clutter-effect.h"
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
#include "clutter-keysyms.h"
|
#include "clutter-keysyms.h"
|
||||||
#include "clutter-main.h"
|
#include "clutter-main.h"
|
||||||
#include "clutter-marshal.h"
|
#include "clutter-marshal.h"
|
||||||
#include "clutter-private.h" /* includes pango/cogl-pango.h */
|
#include "clutter-private.h" /* includes <cogl-pango/cogl-pango.h> */
|
||||||
#include "clutter-profile.h"
|
#include "clutter-profile.h"
|
||||||
#include "clutter-units.h"
|
#include "clutter-units.h"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include <cogl-pango.h>
|
#include <cogl-pango/cogl-pango.h>
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
|
|
||||||
#define SHADOW_X_OFFSET 3
|
#define SHADOW_X_OFFSET 3
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include <cogl/cogl-pango.h>
|
#include <cogl-pango/cogl-pango.h>
|
||||||
|
|
||||||
#define INSTRUCTIONS \
|
#define INSTRUCTIONS \
|
||||||
"Press v\t\342\236\236\tSwitch horizontal/vertical\n" \
|
"Press v\t\342\236\236\tSwitch horizontal/vertical\n" \
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include <cogl/cogl-pango.h>
|
#include <cogl-pango/cogl-pango.h>
|
||||||
|
|
||||||
#define FONT "Sans 12"
|
#define FONT "Sans 12"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user