Commit 71497e41 authored by Bruno Coudoin's avatar Bruno Coudoin
Browse files

updated mingw makefiles.

	Added a new background for traffic from Franck. Since I also did one
	I added traffic background in skins, one from me in babytoy, the new one
	in gartoon.
	Fixed gcompris_im.c not to crash if no profiles are found
	Removed some warnings
parent e5aad26e
2005-10-03 Bruno coudoin <bruno.coudoin@free.fr>
updated mingw makefiles.
Added a new background for traffic from Franck. Since I also did one
I added traffic background in skins, one from me in babytoy, the new one
in gartoon.
Fixed gcompris_im.c not to crash if no profiles are found
Removed some warnings
* Makefile.mingw:
* boards/boardicons/money.png:
* boards/skins/babytoy/traffic-bg.jpg:
* boards/skins/gartoon/traffic-bg.jpg:
* boards/traffic/.cvsignore:
* boards/traffic/traffic.png:
* config.h.mingw:
* configure.in:
* gcompris-installer.nsi:
* po/Makefile.in.in:
* src/boards/traffic.c: (start_board):
* src/gcompris/gcompris_im.c: (gcompris_im_init),
(gcompris_im_reset):
* src/gcompris/gcompris_im.h:
* src/gcompris/images_selector.c: (parseImage),
(read_dataset_directory):
2005-10-02 Bruno coudoin <bruno.coudoin@free.fr>
reviewed by: <delete if not using a buddy>
* config.h.mingw:
* configure.in:
* src/gcompris/gcompris_im.c: (gcompris_im_init),
(gcompris_im_reset):
* src/gcompris/gcompris_im.h:
* src/gcompris/images_selector.c: (parseImage),
(read_dataset_directory):
2005-10-01 Bruno coudoin <bruno.coudoin@free.fr> 2005-10-01 Bruno coudoin <bruno.coudoin@free.fr>
Removed some more warnings Removed some more warnings
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
# Description: Top Makefile for win32 (mingw) port of GCompris # Description: Top Makefile for win32 (mingw) port of GCompris
# #
VERSION = "6.5.3" VERSION = "7.1PRE1"
pkgdatadir = gcompris
GCOMPRIS_SRC = ./src/gcompris GCOMPRIS_SRC = ./src/gcompris
GCOMPRIS_BOARDS = ./src/boards GCOMPRIS_BOARDS = ./src/boards
...@@ -95,5 +97,12 @@ installer: ...@@ -95,5 +97,12 @@ installer:
clean: clean:
$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean $(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean
$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean $(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean
rm -rf config.h $(GCOMPRIS_INSTALL_DIR) rm -rf config.h
rm -rf gcompris*.exe rm -rf gcompris*.exe
#
# Run this on Linux to prepare datadir for windows
#
prep:
mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards
cd boards ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ;
\ No newline at end of file
boards/boardicons/money.png

13.1 KB | W: | H:

boards/boardicons/money.png

3.5 KB | W: | H:

boards/boardicons/money.png
boards/boardicons/money.png
boards/boardicons/money.png
boards/boardicons/money.png
  • 2-up
  • Swipe
  • Onion skin
*.xml
Makefile
Makefile.in
.xvpics
...@@ -134,4 +134,4 @@ ...@@ -134,4 +134,4 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Version number of package */ /* Version number of package */
#define VERSION "6.5.2" #define VERSION "7.1PRE1"
...@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/gcompris/gcompris.c) AC_INIT(src/gcompris/gcompris.c)
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(gcompris, 7.1.0) AM_INIT_AUTOMAKE(gcompris, 7.1PRE1)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
......
...@@ -18,7 +18,7 @@ Var STARTUP_RUN_KEY ...@@ -18,7 +18,7 @@ Var STARTUP_RUN_KEY
;The name var is set in .onInit ;The name var is set in .onInit
Name $name Name $name
!define GCOMPRIS_VERSION "7.1.0" !define GCOMPRIS_VERSION "7.1PRE1"
OutFile "gcompris-${GCOMPRIS_VERSION}.exe" OutFile "gcompris-${GCOMPRIS_VERSION}.exe"
......
...@@ -45,7 +45,6 @@ INSTALL = @INSTALL@ ...@@ -45,7 +45,6 @@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
CC = @CC@ CC = @CC@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@ GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
...@@ -73,7 +72,6 @@ POTFILES = \ ...@@ -73,7 +72,6 @@ POTFILES = \
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@ CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
...@@ -94,7 +92,7 @@ INSTOBJEXT = @INSTOBJEXT@ ...@@ -94,7 +92,7 @@ INSTOBJEXT = @INSTOBJEXT@
.po.cat: .po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \ sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg && rm -f $@ && gencat $@ $*.msg
all: all-@USE_NLS@ all: all-@USE_NLS@
...@@ -130,22 +128,22 @@ install-data-yes: all ...@@ -130,22 +128,22 @@ install-data-yes: all
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \ fi; \
if test -r $$cat; then \ if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
else \ else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \
echo "installing $(srcdir)/$$cat as" \ echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ "$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \ fi; \
if test -r $$cat.m; then \ if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \ else \
if test -r $(srcdir)/$$cat.m ; then \ if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \ $(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ $$dir/$(GETTEXT_PACKAGE).mo.m; \
echo "installing $(srcdir)/$$cat as" \ echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \ else \
true; \ true; \
fi; \ fi; \
...@@ -171,10 +169,10 @@ uninstall: ...@@ -171,10 +169,10 @@ uninstall:
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done done
if test "$(PACKAGE)" = "glib"; then \ if test "$(PACKAGE)" = "glib"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
......
...@@ -169,7 +169,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) ...@@ -169,7 +169,8 @@ static void start_board (GcomprisBoard *agcomprisBoard)
gcompris_bar_set(GCOMPRIS_BAR_LEVEL|GCOMPRIS_BAR_REPEAT); gcompris_bar_set(GCOMPRIS_BAR_LEVEL|GCOMPRIS_BAR_REPEAT);
} }
gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "traffic/traffic.png"); gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),
gcompris_image_to_skin("traffic-bg.jpg"));
traffic_next_level(); traffic_next_level();
......
/* gcompris - gcompris_im.c /* gcompris - gcompris_im.c
* *
* Time-stamp: <2005/09/15 14:56:51 yves> * Time-stamp: <2005/10/02 22:17:33 bruno>
* *
* Copyright (C) 2000,2003 Bruno Coudoin * Copyright (C) 2000,2003 Bruno Coudoin
* *
...@@ -33,16 +33,16 @@ static gint window_focus_callback (GtkWidget *widget, ...@@ -33,16 +33,16 @@ static gint window_focus_callback (GtkWidget *widget,
gpointer user_data); gpointer user_data);
void *gcompris_im_init(GtkWidget *window) void gcompris_im_init(GtkWidget *window)
{ {
GcomprisProperties *properties = gcompris_get_properties (); GcomprisProperties *properties = gcompris_get_properties ();
/* set IMContext */ /* set IMContext */
properties->context = gtk_im_multicontext_new (); properties->context = gtk_im_multicontext_new ();
GtkWidget *submenu;
if(gcompris_get_current_profile())
{
GHashTable *init_im = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); GHashTable *init_im = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
init_im = gcompris_get_conf_with_table (gcompris_get_current_profile()->profile_id, init_im = gcompris_get_conf_with_table (gcompris_get_current_profile()->profile_id,
-1, -1,
...@@ -54,6 +54,7 @@ void *gcompris_im_init(GtkWidget *window) ...@@ -54,6 +54,7 @@ void *gcompris_im_init(GtkWidget *window)
g_setenv ("GTK_IM_MODULE", g_setenv ("GTK_IM_MODULE",
properties->default_context, properties->default_context,
TRUE); TRUE);
}
gtk_im_context_set_client_window (properties->context, gtk_im_context_set_client_window (properties->context,
window->window); window->window);
...@@ -72,7 +73,7 @@ void *gcompris_im_init(GtkWidget *window) ...@@ -72,7 +73,7 @@ void *gcompris_im_init(GtkWidget *window)
} }
void *gcompris_im_reset() void gcompris_im_reset()
{ {
GcomprisProperties *properties = gcompris_get_properties (); GcomprisProperties *properties = gcompris_get_properties ();
gtk_im_context_reset (properties->context); gtk_im_context_reset (properties->context);
......
/* gcompris - gcompris_im.h /* gcompris - gcompris_im.h
* *
* Time-stamp: <2005/09/21 15:01:36 yves> * Time-stamp: <2005/10/02 22:12:39 bruno>
* *
* Copyright (C) 2005 Bruno Coudoin * Copyright (C) 2005 Bruno Coudoin
* *
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#ifndef GCOMPRIS_IM_H #ifndef GCOMPRIS_IM_H
#define GCOMPRIS_IM_H #define GCOMPRIS_IM_H
void *gcompris_im_init(); void gcompris_im_init();
void *gcompris_board_change_context(); void gcompris_board_change_context();
void *gcompris_im_reset(); void gcompris_im_reset();
#endif #endif
......
...@@ -52,7 +52,6 @@ static gboolean images_selector_displayed = FALSE; ...@@ -52,7 +52,6 @@ static gboolean images_selector_displayed = FALSE;
static GnomeCanvasItem *rootitem = NULL; static GnomeCanvasItem *rootitem = NULL;
static GnomeCanvasItem *current_root_set = NULL; static GnomeCanvasItem *current_root_set = NULL;
static GnomeCanvasItem *item_content = NULL;
static GnomeCanvas *canvas_list_selector; /* The scrolled left part */ static GnomeCanvas *canvas_list_selector; /* The scrolled left part */
static GnomeCanvasItem *list_bg_item; static GnomeCanvasItem *list_bg_item;
...@@ -701,7 +700,7 @@ parseImage (xmlDocPtr doc, xmlNodePtr cur) { ...@@ -701,7 +700,7 @@ parseImage (xmlDocPtr doc, xmlNodePtr cur) {
} }
imageset_directory = g_dir_open (pathname, 0, error); imageset_directory = g_dir_open (pathname, 0, error);
const gchar * onefile; const gchar * onefile;
while (onefile = g_dir_read_name(imageset_directory)){ while ((onefile = g_dir_read_name(imageset_directory))){
if ((g_ascii_strcasecmp (type,"lsdir") != 0) && if ((g_ascii_strcasecmp (type,"lsdir") != 0) &&
(!g_str_has_suffix (onefile, type))){ (!g_str_has_suffix (onefile, type))){
continue; continue;
...@@ -806,7 +805,7 @@ read_dataset_directory(gchar *dataset_dir) ...@@ -806,7 +805,7 @@ read_dataset_directory(gchar *dataset_dir)
GDir *dataset_directory = g_dir_open (dataset_dir, 0, error); GDir *dataset_directory = g_dir_open (dataset_dir, 0, error);
gchar *fname, *absolute_fname; gchar *fname, *absolute_fname;
while (fname = g_dir_read_name(dataset_directory)) { while ((fname = g_dir_read_name(dataset_directory))) {
/* skip files without ".xml" */ /* skip files without ".xml" */
if (!g_str_has_suffix (fname,".xml")){ if (!g_str_has_suffix (fname,".xml")){
printf("skipping file not in .xml : %s\n", fname); printf("skipping file not in .xml : %s\n", fname);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment