diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2010-05-29 14:24:41 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2010-06-01 13:10:54 +0100 |
| commit | a58b08438637c122d3d85770f35958fc4855bed5 (patch) | |
| tree | d18b31f5d145061d34867dbdcb3a89953e71117e | |
| parent | 7fac48c7ade80a2bec08c5e85f32dfaea8d1b6a1 (diff) | |
| download | clutter-1.0.tar.gz | |
build: Fix introspection generation for 1.0.xclutter-1.0
g-ir-scanner has changed when it comes to accepting parsing errors and
it's not possible to generate the introspection data on 1.0.0 with
recent-enough g-ir-scanner/g-ir-compiler.
This patch makes Clutter 1.0.x generate introspection data again.
| -rw-r--r-- | clutter/clutter-animation.c | 6 | ||||
| -rw-r--r-- | clutter/cogl/cogl-shader.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c index 6305661e4..72062c15a 100644 --- a/clutter/clutter-animation.c +++ b/clutter/clutter-animation.c @@ -1995,7 +1995,7 @@ clutter_actor_animate (ClutterActor *actor, * @n_properties: number of property names and values * @properties: (array length=n_properties) (element-type utf8): a vector * containing the property names to set - * @values: (array length=n_properies): a vector containing the + * @values: (array length=n_properties): a vector containing the * property values to set * * Animates the given list of properties of @actor between the current @@ -2047,7 +2047,7 @@ clutter_actor_animatev (ClutterActor *actor, * @n_properties: number of property names and values * @properties: (array length=n_properties) (element-type utf8): a vector * containing the property names to set - * @values: (array length=n_properies): a vector containing the + * @values: (array length=n_properties): a vector containing the * property values to set * * Animates the given list of properties of @actor between the current @@ -2102,7 +2102,7 @@ clutter_actor_animate_with_timelinev (ClutterActor *actor, * @n_properties: number of property names and values * @properties: (array length=n_properties) (element-type utf8): a vector * containing the property names to set - * @values: (array length=n_properies): a vector containing the + * @values: (array length=n_properties): a vector containing the * property values to set * * Animates the given list of properties of @actor between the current diff --git a/clutter/cogl/cogl-shader.h b/clutter/cogl/cogl-shader.h index 9eec9bb40..2d42ee653 100644 --- a/clutter/cogl/cogl-shader.h +++ b/clutter/cogl/cogl-shader.h @@ -28,6 +28,7 @@ #ifndef __COGL_SHADER_H__ #define __COGL_SHADER_H__ +#include <GL/gl.h> #include <cogl/cogl-types.h> G_BEGIN_DECLS |