gnome-games r8298 - in trunk: aisleriot libgames-support

[chpe svn gnome org]

Author: chpe
Date: Sun Nov  9 15:10:58 2008
New Revision: 8298
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8298&view=rev

Log:
Remove *DIR defines from aisleriot Makefile.am, and add
GAMES_RUNTIME_GAME_HELP_DIRECTORY for win32/hildon.

Modified:
   trunk/aisleriot/Makefile.am
   trunk/aisleriot/board.c
   trunk/aisleriot/sol.c
   trunk/libgames-support/games-runtime.c
   trunk/libgames-support/games-runtime.h

Modified: trunk/aisleriot/Makefile.am
==============================================================================
--- trunk/aisleriot/Makefile.am	(original)
+++ trunk/aisleriot/Makefile.am	Sun Nov  9 15:10:58 2008
@@ -58,14 +58,7 @@
 # FIXMEchpe: fix localedir for maemo? $PKG_CONFIG osso-af-settings --variable=localedir
 
 sol_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/libgames-support	\
-	-DDATADIR="\"$(datadir)\""		\
-	-DICONDIR="\"$(datadir)/icons/hicolor\""\
-	-DGAMESDIR="\"$(scmdir)\""		\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
-	-DPIXMAPDIR="\"$(pkgdatadir)/pixmaps\""	\
-	-DPKGDATADIR="\"$(pkgdatadir)\""	\
+	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
 
 sol_CFLAGS = \
@@ -77,12 +70,11 @@
 	$(AM_LDFLAGS)
 
 sol_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la	\
-	$(GTK_LIBS)	    \
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GTK_LIBS) \
 	$(GUILE_LIBS)
 
 if HAVE_HILDON
-sol_CPPFLAGS += -DHELPDIR="\"$(pkgdatadir)/aisleriot/help\""
 sol_CFLAGS += $(HILDON_CFLAGS)
 sol_LDADD += $(HILDON_LIBS)
 endif

Modified: trunk/aisleriot/board.c
==============================================================================
--- trunk/aisleriot/board.c	(original)
+++ trunk/aisleriot/board.c	Sun Nov  9 15:10:58 2008
@@ -28,6 +28,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <clutter/clutter.h>
+// #include <clutter-gtk/gtk-clutter-util.h>
 
 #include <libgames-support/games-card-images.h>
 #include <libgames-support/games-files.h>

Modified: trunk/aisleriot/sol.c
==============================================================================
--- trunk/aisleriot/sol.c	(original)
+++ trunk/aisleriot/sol.c	Sun Nov  9 15:10:58 2008
@@ -54,10 +54,6 @@
 #include <windows.h>
 #include <io.h>
 #define HELP_EXT "xhtml"
-/* FIXME On win32 help is created as html with gnome-doc-tool,
- * and put manually in the directory below.
- */
-#define HELPDIR PKGDATADIR "/aisleriot/help"
 #endif /* G_OS_WIN32 */
 
 #include <libgames-support/games-files.h>
@@ -277,10 +273,14 @@
         strchr (lang, '@') != NULL)
       continue;
 
-    path = games_path_runtime_fix (g_strdup_printf (HELPDIR G_DIR_SEPARATOR_S "%s" 
-				   G_DIR_SEPARATOR_S "%s." HELP_EXT,
-                                   lang,
-                                   help_section ? help_section : "aisleriot"));
+    help_file_name = g_strdup_printf ("%s." HELP_EXT,
+                                      help_section ? help_section : "aisleriot");
+    path = g_build_filename (games_runtime_get_directory (GAMES_RUNTIME_GAME_HELP_DIRECTORY),
+                             lang,
+                             help_file_name,
+                             NULL);
+    g_free (help_file_name);
+
     if (g_file_test (path, G_FILE_TEST_EXISTS)) {
       help_url = g_strdup_printf ("file://%s", path);
       g_free (path);

Modified: trunk/libgames-support/games-runtime.c
==============================================================================
--- trunk/libgames-support/games-runtime.c	(original)
+++ trunk/libgames-support/games-runtime.c	Sun Nov  9 15:10:58 2008
@@ -61,6 +61,7 @@
   { GAMES_RUNTIME_GAME_DATA_DIRECTORY,    "games"          }, /* GAMES_RUNTIME_GAME_GAMES_DIRECTORY        */
   { GAMES_RUNTIME_GAME_DATA_DIRECTORY,    "pixmaps"        }, /* GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY       */
   { GAMES_RUNTIME_GAME_DATA_DIRECTORY,    "themes"         }, /* GAMES_RUNTIME_GAME_THEME_DIRECTORY        */
+  { GAMES_RUNTIME_GAME_DATA_DIRECTORY,    "help"           }, /* GAMES_RUNTIME_GAME_HELP_DIRECTORY         */
 };
 
 typedef int _assertion[G_N_ELEMENTS (derived_directories) + GAMES_RUNTIME_FIRST_DERIVED_DIRECTORY == GAMES_RUNTIME_LAST_DIRECTORY ? 1 : -1];

Modified: trunk/libgames-support/games-runtime.h
==============================================================================
--- trunk/libgames-support/games-runtime.h	(original)
+++ trunk/libgames-support/games-runtime.h	Sun Nov  9 15:10:58 2008
@@ -48,6 +48,8 @@
   GAMES_RUNTIME_GAME_GAMES_DIRECTORY,
   GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY,
   GAMES_RUNTIME_GAME_THEME_DIRECTORY,
+  /* FIXME On hildon and win32 help is created as html with gnome-doc-tool, and put manually in this directory */
+  GAMES_RUNTIME_GAME_HELP_DIRECTORY,
 
   GAMES_RUNTIME_LAST_DIRECTORY,
 #ifdef G_OS_WIN32