gnome-games r8494 - trunk/libgames-support

[chpe svn gnome org]

Author: chpe
Date: Tue Jan  6 18:20:25 2009
New Revision: 8494
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8494&view=rev

Log:
Only build the enabled card theme formats.

Modified:
   trunk/libgames-support/Makefile.am
   trunk/libgames-support/games-card-theme-private.h
   trunk/libgames-support/games-card-theme.c

Modified: trunk/libgames-support/Makefile.am
==============================================================================
--- trunk/libgames-support/Makefile.am	(original)
+++ trunk/libgames-support/Makefile.am	Tue Jan  6 18:20:25 2009
@@ -32,7 +32,6 @@
 	games-card-theme.c		\
 	games-card-theme.h		\
 	games-card-theme-private.h	\
-	games-card-theme-fixed.c	\
 	games-card-themes.c		\
 	games-card-themes.h		\
 	games-conf.c			\
@@ -69,9 +68,6 @@
 	games-gridframe.h		\
 	games-card-selector.c		\
 	games-card-selector.h		\
-	games-card-theme-preimage.c	\
-	games-card-theme-pysol.c	\
-	games-card-theme-sliced.c	\
 	games-preimage.c                \
 	games-preimage.h                \
 	games-preimage-private.h	\
@@ -102,13 +98,6 @@
 endif
 endif
 
-if HAVE_RSVG
-libgames_support_la_SOURCES += \
-	games-card-theme-svg.c		\
-	games-card-theme-kde.c		\
-	$(NULL)
-endif
-
 if HAVE_CLUTTER
 libgames_support_la_SOURCES += \
 	games-card-textures-cache.c	\
@@ -118,6 +107,28 @@
 	$(NULL)
 endif
 
+if HAVE_RSVG
+libgames_support_la_SOURCES += games-card-theme-preimage.c
+
+if ENABLE_CARD_THEME_FORMAT_SVG
+libgames_support_la_SOURCES += games-card-theme-svg.c
+endif
+if ENABLE_CARD_THEME_FORMAT_KDE
+libgames_support_la_SOURCES += games-card-theme-kde.c
+endif
+
+endif # HAVE_RSVG
+
+if ENABLE_CARD_THEME_FORMAT_SLICED
+libgames_support_la_SOURCES += games-card-theme-sliced.c
+endif
+if ENABLE_CARD_THEME_FORMAT_PYSOL
+libgames_support_la_SOURCES += games-card-theme-pysol.c
+endif
+if ENABLE_CARD_THEME_FORMAT_FIXED
+libgames_support_la_SOURCES += games-card-theme-fixed.c
+endif
+
 libgames_support_la_CPPFLAGS = \
 	-DPKGDATADIR="\"$(pkgdatadir)\""			\
 	-DDATADIR="\"$(datadir)\""				\

Modified: trunk/libgames-support/games-card-theme-private.h
==============================================================================
--- trunk/libgames-support/games-card-theme-private.h	(original)
+++ trunk/libgames-support/games-card-theme-private.h	Tue Jan  6 18:20:25 2009
@@ -109,6 +109,8 @@
 
 void _games_card_theme_emit_changed (GamesCardTheme *theme);
 
+#ifdef HAVE_RSVG
+
 /* GamesCardThemePreimage (abstract) */
 
 #define GAMES_TYPE_CARD_THEME_PREIMAGE            (games_card_theme_preimage_get_type ())
@@ -121,8 +123,6 @@
 typedef struct _GamesCardThemePreimageClass GamesCardThemePreimageClass;
 typedef struct _GamesCardThemePreimage      GamesCardThemePreimage;
 
-#ifndef HAVE_HILDON
-
 struct _GamesCardThemePreimageClass {
   GamesCardThemeClass parent_class;
 
@@ -150,14 +150,14 @@
   cairo_font_options_t *font_options;
 };
 
-#endif /* !HAVE_HILDON */
-
 GType games_card_theme_preimage_get_type (void);
 
 void _games_card_theme_preimage_clear_sized_theme_data (GamesCardThemePreimage *theme);
 
 /* GamesCardThemeSVG */
 
+#ifdef ENABLE_CARD_THEME_FORMAT_SVG
+
 #define GAMES_TYPE_CARD_THEME_SVG            (games_card_theme_svg_get_type ())
 #define GAMES_CARD_THEME_SVG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAMES_TYPE_CARD_THEME_SVG, GamesCardThemeSVG))
 #define GAMES_CARD_THEME_SVG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAMES_TYPE_CARD_THEME_SVG, GamesCardThemeSVGClass))
@@ -172,24 +172,12 @@
 
 GamesCardTheme* games_card_theme_svg_new (void);
 
-/* GamesCardThemeSliced */
-
-#define GAMES_TYPE_CARD_THEME_SLICED            (games_card_theme_sliced_get_type ())
-#define GAMES_CARD_THEME_SLICED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAMES_TYPE_CARD_THEME_SLICED, GamesCardThemeSliced))
-#define GAMES_CARD_THEME_SLICED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAMES_TYPE_CARD_THEME_SLICED, GamesCardThemeSlicedClass))
-#define GAMES_IS_CARD_THEME_SLICED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAMES_TYPE_CARD_THEME_SLICED))
-#define GAMES_IS_CARD_THEME_SLICED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAMES_TYPE_CARD_THEME_SLICED))
-#define GAMES_CARD_THEME_SLICED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GAMES_TYPE_CARD_THEME_SLICED, GamesCardThemeSlicedClass))
-
-typedef struct _GamesCardThemeSlicedClass GamesCardThemeSlicedClass;
-typedef struct _GamesCardThemeSliced      GamesCardThemeSliced;
-
-GType games_card_theme_sliced_get_type (void);
-
-GamesCardTheme* games_card_theme_sliced_new (void);
+#endif /* ENABLE_CARD_THEME_FORMAT_SVG */
 
 /* GamesCardThemeKDE */
 
+#ifdef ENABLE_CARD_THEME_FORMAT_KDE
+
 #define GAMES_TYPE_CARD_THEME_KDE            (games_card_theme_kde_get_type ())
 #define GAMES_CARD_THEME_KDE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAMES_TYPE_CARD_THEME_KDE, GamesCardThemeKDE))
 #define GAMES_CARD_THEME_KDE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAMES_TYPE_CARD_THEME_KDE, GamesCardThemeKDEClass))
@@ -204,8 +192,36 @@
 
 GamesCardTheme* games_card_theme_kde_new (void);
 
+#endif /* ENABLE_CARD_THEME_FORMAT_KDE */
+
+/* */
+
+#endif /* HAVE_RSVG */
+
+/* GamesCardThemeSliced */
+
+#ifdef ENABLE_CARD_THEME_FORMAT_SLICED
+
+#define GAMES_TYPE_CARD_THEME_SLICED            (games_card_theme_sliced_get_type ())
+#define GAMES_CARD_THEME_SLICED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAMES_TYPE_CARD_THEME_SLICED, GamesCardThemeSliced))
+#define GAMES_CARD_THEME_SLICED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAMES_TYPE_CARD_THEME_SLICED, GamesCardThemeSlicedClass))
+#define GAMES_IS_CARD_THEME_SLICED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAMES_TYPE_CARD_THEME_SLICED))
+#define GAMES_IS_CARD_THEME_SLICED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAMES_TYPE_CARD_THEME_SLICED))
+#define GAMES_CARD_THEME_SLICED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GAMES_TYPE_CARD_THEME_SLICED, GamesCardThemeSlicedClass))
+
+typedef struct _GamesCardThemeSlicedClass GamesCardThemeSlicedClass;
+typedef struct _GamesCardThemeSliced      GamesCardThemeSliced;
+
+GType games_card_theme_sliced_get_type (void);
+
+GamesCardTheme* games_card_theme_sliced_new (void);
+
+#endif /* ENABLE_CARD_THEME_FORMAT_SLICED */
+
 /* GamesCardThemeFixed */
 
+#ifdef ENABLE_CARD_THEME_FORMAT_FIXED
+
 #define GAMES_TYPE_CARD_THEME_FIXED            (games_card_theme_fixed_get_type ())
 #define GAMES_CARD_THEME_FIXED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAMES_TYPE_CARD_THEME_FIXED, GamesCardThemeFixed))
 #define GAMES_CARD_THEME_FIXED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAMES_TYPE_CARD_THEME_FIXED, GamesCardThemeFixedClass))
@@ -220,8 +236,11 @@
 
 GamesCardTheme* games_card_theme_fixed_new (void);
 
+#endif /* ENABLE_CARD_THEME_FORMAT_FIXED */
 /* GamesCardThemePysol */
 
+#ifdef ENABLE_CARD_THEME_FORMAT_PYSOL
+
 #define GAMES_TYPE_CARD_THEME_PYSOL            (games_card_theme_pysol_get_type ())
 #define GAMES_CARD_THEME_PYSOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAMES_TYPE_CARD_THEME_PYSOL, GamesCardThemePysol))
 #define GAMES_CARD_THEME_PYSOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAMES_TYPE_CARD_THEME_PYSOL, GamesCardThemePysolClass))
@@ -236,4 +255,4 @@
 
 GamesCardTheme* games_card_theme_pysol_new (void);
 
-/* Utilities */
+#endif /* ENABLE_CARD_THEME_FORMAT_PYSOL */

Modified: trunk/libgames-support/games-card-theme.c
==============================================================================
--- trunk/libgames-support/games-card-theme.c	(original)
+++ trunk/libgames-support/games-card-theme.c	Tue Jan  6 18:20:25 2009
@@ -334,16 +334,25 @@
                     GType b)
 {
   const GType types[] = {
-#ifdef HAVE_HILDON
-    GAMES_TYPE_CARD_THEME_FIXED
-#else
+  /* List of supported theme types, in order of decreasing precedence */
 #ifdef HAVE_RSVG
-    GAMES_TYPE_CARD_THEME_SVG,
-    GAMES_TYPE_CARD_THEME_KDE,
+#ifdef ENABLE_CARD_THEME_FORMAT_SVG
+  GAMES_TYPE_CARD_THEME_SVG,
+#endif
+#ifdef ENABLE_CARD_THEME_FORMAT_KDE
+  GAMES_TYPE_CARD_THEME_KDE,
+#endif
+#endif /* HAVE_RSVG */
+#ifndef HAVE_HILDON
+#ifdef ENABLE_CARD_THEME_FORMAT_SLICED
+  GAMES_TYPE_CARD_THEME_SLICED,
+#endif
+#ifdef ENABLE_CARD_THEME_FORMAT_PYSOL
+  GAMES_TYPE_CARD_THEME_PYSOL,
 #endif
-    GAMES_TYPE_CARD_THEME_PYSOL,
-    GAMES_TYPE_CARD_THEME_FIXED,
-    GAMES_TYPE_CARD_THEME_SLICED
+#endif /* !HAVE_HILDON */
+#ifdef ENABLE_CARD_THEME_FORMAT_FIXED
+  GAMES_TYPE_CARD_THEME_FIXED
 #endif
   };
   guint ia, ib;