isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

2007-02-14 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/Makefile.am:
        * clutter/clutter-main.c:
        * clutter/clutter-stage.c:
        * clutter/clutter-version.h.in:
        * configure.ac:
        * examples/super-oh.c:
        Add CLUTTER_FLAVOUR define.
This commit is contained in:
Matthew Allum 2007-02-13 23:31:57 +00:00
parent 356970fbc1
commit 231b56b3e2
7 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-02-14 Matthew Allum <mallum@openedhand.com>
* clutter/Makefile.am:
* clutter/clutter-main.c:
* clutter/clutter-stage.c:
* clutter/clutter-version.h.in:
* configure.ac:
* examples/super-oh.c:
Add CLUTTER_FLAVOUR define.
2007-02-13 Matthew Allum <mallum@openedhand.com> 2007-02-13 Matthew Allum <mallum@openedhand.com>
* examples/super-oh.c: (screensaver_setup): * examples/super-oh.c: (screensaver_setup):

3
clutter/Makefile.am
View File

@ -141,8 +141,7 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Clutter\" \ -DG_LOG_DOMAIN=\"Clutter\" \
$(GCC_FLAGS) \ $(GCC_FLAGS) \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS)
-DCLUTTER_BACKEND_GLX
lib_LTLIBRARIES = libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la lib_LTLIBRARIES = libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la

3
clutter/clutter-main.c
View File

@ -42,8 +42,9 @@
#include "clutter-stage.h" #include "clutter-stage.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-version.h" /* For flavour define */
#ifdef CLUTTER_BACKEND_GLX #ifdef CLUTTER_FLAVOUR_GLX
#include <clutter/clutter-backend-glx.h> #include <clutter/clutter-backend-glx.h>
#endif #endif

5
clutter/clutter-stage.c
View File

@ -41,12 +41,13 @@
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-version.h" /* For flavour */
#ifdef CLUTTER_BACKEND_GLX #ifdef CLUTTER_FLAVOUR_GLX
#include <clutter/clutter-stage-glx.h> #include <clutter/clutter-stage-glx.h>
#endif #endif
#ifdef CLUTTER_BACKEND_EGL #ifdef CLUTTER_FLAVOUR_EGL
#include <clutter/clutter-stage-egl.h> #include <clutter/clutter-stage-egl.h>
#endif #endif

2
clutter/clutter-version.h.in
View File

@ -41,4 +41,6 @@
(CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \ (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \
(CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION > (micro))) (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION > (micro)))
#define @CLUTTER_FLAVOUR_DEFINE@
#endif /* __CLUTTER_VERSION_H__ */ #endif /* __CLUTTER_VERSION_H__ */

2
configure.ac
View File

@ -98,7 +98,9 @@ fi
GLX_CFLAGS="$X11_CFLAGS" GLX_CFLAGS="$X11_CFLAGS"
CLUTTER_FLAVOUR="glx" CLUTTER_FLAVOUR="glx"
CLUTTER_FLAVOUR_DEFINE="CLUTTER_FLAVOUR_GLX"
AC_SUBST(CLUTTER_FLAVOUR) AC_SUBST(CLUTTER_FLAVOUR)
AC_SUBST(CLUTTER_FLAVOUR_DEFINE)
dnl ======================================================================== dnl ========================================================================

4
examples/super-oh.c
View File

@ -1,5 +1,7 @@
#include <clutter/clutter.h> #include <clutter/clutter.h>
#ifdef CLUTTER_FLAVOUR_GLX
#include <clutter/clutter-backend-glx.h> #include <clutter/clutter-backend-glx.h>
#endif
#include <math.h> #include <math.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
@ -38,6 +40,7 @@ get_radius (void)
void void
screensaver_setup (void) screensaver_setup (void)
{ {
#ifdef CLUTTER_FLAVOUR_GLX
Window remote_xwindow; Window remote_xwindow;
const char *preview_xid; const char *preview_xid;
gboolean foreign_success = FALSE; gboolean foreign_success = FALSE;
@ -60,6 +63,7 @@ screensaver_setup (void)
if (!foreign_success) if (!foreign_success)
clutter_actor_set_size (clutter_stage_get_default(), 800, 600); clutter_actor_set_size (clutter_stage_get_default(), 800, 600);
#endif
} }
/* input handler */ /* input handler */