brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "build: Detect the appropriate default flavour"

Browse Source 
Ouch, butterfingers and git commit -a.

This reverts commit 81e8c8dec9.
This commit is contained in:
Emmanuele Bassi 2011-07-13 14:26:05 +01:00
parent d67bc235a4
commit 9a3b97b55e
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-actor.c
View File

@ -6110,8 +6110,6 @@ clutter_actor_get_allocation_box (ClutterActor *self,
* The returned rectangle is in pixels. * The returned rectangle is in pixels.
* *
* Since: 0.8 * Since: 0.8
*
* Deprecated: 1.8: Use clutter_actor_get_allocation_box() instead.
*/ */
void void
clutter_actor_get_allocation_geometry (ClutterActor *self, clutter_actor_get_allocation_geometry (ClutterActor *self,
@ -6246,9 +6244,6 @@ clutter_actor_allocate (ClutterActor *self,
* size, in pixels. This means the untransformed actor will have the * size, in pixels. This means the untransformed actor will have the
* given geometry. This is the same as calling clutter_actor_set_position() * given geometry. This is the same as calling clutter_actor_set_position()
* and clutter_actor_set_size(). * and clutter_actor_set_size().
*
* Deprecated: 1.8: Use clutter_actor_set_position() and
* clutter_actor_set_size() instead.
*/ */
void void
clutter_actor_set_geometry (ClutterActor *self, clutter_actor_set_geometry (ClutterActor *self,
@ -6271,9 +6266,6 @@ clutter_actor_set_geometry (ClutterActor *self,
* actor. This is the same as calling clutter_actor_get_position() and * actor. This is the same as calling clutter_actor_get_position() and
* clutter_actor_get_size(). It tries to "do what you mean" and get the * clutter_actor_get_size(). It tries to "do what you mean" and get the
* requested size and position if the actor's allocation is invalid. * requested size and position if the actor's allocation is invalid.
*
* Deprecated: 1.8: Use clutter_actor_get_position() and
* clutter_actor_get_size() instead.
*/ */
void void
clutter_actor_get_geometry (ClutterActor *self, clutter_actor_get_geometry (ClutterActor *self,

16
clutter/clutter-actor.h
View File

@ -385,25 +385,15 @@ void clutter_actor_allocate_align_fill (ClutterActor
ClutterAllocationFlags flags); ClutterAllocationFlags flags);
void clutter_actor_get_allocation_box (ClutterActor *self, void clutter_actor_get_allocation_box (ClutterActor *self,
ClutterActorBox *box); ClutterActorBox *box);
#ifndef CLUTTER_DISABLE_DEPRECATED
void clutter_actor_get_allocation_geometry (ClutterActor *self, void clutter_actor_get_allocation_geometry (ClutterActor *self,
ClutterGeometry *geom) ClutterGeometry *geom);
G_GNUC_DEPRECATED_FOR(clutter_actor_get_allocation_box);
#endif /* CLUTTER_DISABLE_DEPRECATED */
void clutter_actor_get_allocation_vertices (ClutterActor *self, void clutter_actor_get_allocation_vertices (ClutterActor *self,
ClutterActor *ancestor, ClutterActor *ancestor,
ClutterVertex verts[]); ClutterVertex verts[]);
#ifndef CLUTTER_DISABLE_DEPRECATED
void clutter_actor_set_geometry (ClutterActor *self, void clutter_actor_set_geometry (ClutterActor *self,
const ClutterGeometry *geometry) const ClutterGeometry *geometry);
G_GNUC_DEPRECATED;
void clutter_actor_get_geometry (ClutterActor *self, void clutter_actor_get_geometry (ClutterActor *self,
ClutterGeometry *geometry) ClutterGeometry *geometry);
G_GNUC_DEPRECATED;
#endif /* CLUTTER_DISABLE_DEPRECATED */
void clutter_actor_set_size (ClutterActor *self, void clutter_actor_set_size (ClutterActor *self,
gfloat width, gfloat width,
gfloat height); gfloat height);

8
configure.ac
View File

@ -94,9 +94,6 @@ AS_CASE([$host],
AC_MSG_RESULT([$platform_win32]) AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"]) AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
AC_CHECK_HEADER([OpenGL/gl.h], [platform_quartz=yes], [platform_quartz=no])
AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"])
AC_SUBST(CLUTTER_LT_VERSION) AC_SUBST(CLUTTER_LT_VERSION)
AC_SUBST(CLUTTER_LT_LDFLAGS) AC_SUBST(CLUTTER_LT_LDFLAGS)
@ -170,10 +167,7 @@ AC_SUBST(CLUTTER_LINK_FLAGS)
dnl ======================================================================== dnl ========================================================================
# defaults # defaults
AS_IF([test "x$platform_win32" = "xyes"], [CLUTTER_FLAVOUR=win32], CLUTTER_FLAVOUR=glx
[test "x$platform_quartz" = "xyes"], [CLUTTER_FLAVOUR=osx],
[CLUTTER_FLAVOUR=glx])
FLAVOUR_LIBS="" FLAVOUR_LIBS=""
FLAVOUR_CFLAGS="" FLAVOUR_CFLAGS=""
CLUTTER_WINSYS_BASE= CLUTTER_WINSYS_BASE=