- Added missing French audio voices by Zohra Coudoin

	  Released under GPL

	* Makefile.mingw.in: created based on Makefile.mingw to include @VERSION@
	* boards/clickgame/nur00523.jpg: moved from boards/gcompris/
	* boards/geography/board4_2.xml.in: fixed zambia.png reference (was broken link)
	* boards/skins/gartoon/mini_bad.png: rotate to make it more like it's bad
	* gcompris-edit.desktop.in: moved edit menu in the same section as GCompris.
	* gcompris-installer.nsi.in: now will get version automatically
	* gcompris-uninstal.ico: remade, not sure yet it will be accepted by the installer
	* po/POTFILES.in:
	* src/boards/shapegame.c: (shapegame_init_canvas), (item_event): now the tooltip is always
	                          locate in the lower left to avoid hidding the map.
	* src/gcompris/config.c: (set_locale_flag): fixed to display no flags if none found
	* src/gcompris/gcompris.c: replaced display_resource by display-resource

1 files changed, 122 insertions, 0 deletions

diff --git a/Makefile.mingw.in b/Makefile.mingw.in
new file mode 100644
index 0000000..1aff33d
--- /dev/null
+++ b/Makefile.mingw.in
@@ -0,0 +1,122 @@
+# Makefile.mingw
+#
+# Author: Bruno Coudoin (from GAIM example)
+# Description: Top Makefile for win32 (mingw) port of GCompris
+#
+
+VERSION = "@VERSION@"
+
+pkgdatadir = gcompris
+
+GCOMPRIS_SRC = ./src/gcompris
+GCOMPRIS_BOARDS = ./src/boards
+GCOMPRIS_INSTALL_DIR = ./win32-install-dir
+
+GTK_TOP :=		/gtk
+GNUWIN32_TOP :=		/gnuwin32
+LIBXML2_TOP :=		/libxml2
+SDL_TOP :=		/sdl
+CANVAS_TOP :=		/gnomecanvas
+GNUCHESS_TOP :=		/gnuchess
+
+MAKENSIS := "/c/Program Files/NSIS/makensis.exe"
+
+# These will be copied in the win32-install-dir ready to be packaged.
+NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC.dll \
+			$(GNUCHESS_TOP)/bin/libreadline.dll \
+			$(GTK_TOP)/bin/gspawn-win32-helper.exe \
+			$(GNUCHESS_TOP)/bin/gnuchess.exe \
+			$(GNUWIN32_TOP)/bin/popt1.dll \
+			$(GNUWIN32_TOP)/bin/libintl-2.dll \
+			$(GNUWIN32_TOP)/bin/libiconv-2.dll \
+			$(CANVAS_TOP)/bin/libgnomecanvas-2-0.dll \
+			$(SDL_TOP)/bin/SDL.dll \
+			$(SDL_TOP)/bin/SDL_mixer.dll \
+			$(LIBXML2_TOP)/bin/libxml2.dll \
+			$(GTK_TOP)/bin/freetype6.dll \
+			$(GTK_TOP)/bin/intl.dll \
+			$(GTK_TOP)/bin/libart_lgpl_2-2.dll \
+			$(GTK_TOP)/bin/freetype6.dll \
+			$(GTK_TOP)/bin/libart_lgpl_2-2.dll \
+			$(GTK_TOP)/bin/libgdk-win32-2.0-0.dll \
+			$(GTK_TOP)/bin/libgdk_pixbuf-2.0-0.dll \
+			$(GTK_TOP)/bin/libglib-2.0-0.dll \
+			$(GTK_TOP)/bin/libgmodule-2.0-0.dll \
+			$(GTK_TOP)/bin/libgobject-2.0-0.dll \
+			$(GTK_TOP)/bin/libpango-1.0-0.dll \
+			$(GTK_TOP)/bin/libpangowin32-1.0-0.dll \
+			$(GTK_TOP)/bin/libpangoft2-1.0-0.dll \
+			$(GTK_TOP)/bin/libgtk-win32-2.0-0.dll \
+			$(GTK_TOP)/bin/libatk-1.0-0.dll \
+			$(GTK_TOP)/bin/libfontconfig-1.dll \
+			$(GTK_TOP)/bin/zlib1.dll \
+			$(GTK_TOP)/bin/libgthread-2.0-0.dll \
+			$(GTK_TOP)/expat/bin/xmlparse.dll \
+			$(GTK_TOP)/expat/bin/xmltok.dll \
+			$(GTK_TOP)/bin/iconv.dll \
+			$(GTK_TOP)/bin/intl.dll \
+			$(GTK_TOP)/bin/libpng12.dll \
+			$(GTK_TOP)/bin/jpeg62.dll
+
+NEEDED_FILES =		README \
+			COPYING \
+			COPYING \
+			Changelog
+
+##
+##
+
+all:
+	cp config.h.mingw config.h
+	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw
+	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw
+
+
+install: all
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share
+	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw install
+	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw install
+
+# Copy mandratory files for the package in the package directory
+prepack:
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK
+	cp $(NEEDED_DLLS) $(GCOMPRIS_INSTALL_DIR)
+	cp $(NEEDED_FILES) $(GCOMPRIS_INSTALL_DIR)
+	cp -r $(GTK_TOP)/etc $(GCOMPRIS_INSTALL_DIR)
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK/share
+	cp -r $(GTK_TOP)/share/themes $(GCOMPRIS_INSTALL_DIR)/share
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib
+	cp -r $(GTK_TOP)/lib/locale $(GCOMPRIS_INSTALL_DIR)/lib
+	cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
+	cp -r $(GTK_TOP)/lib/pango $(GCOMPRIS_INSTALL_DIR)/lib
+
+
+installer:
+	$(MAKENSIS) gcompris-installer.nsi
+
+clean:
+	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean
+	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean
+	rm -rf config.h
+	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 .. ;
+	@echo "-------------------------------------------------------------------------------"
+	@echo " WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST"
+	@echo "-------------------------------------------------------------------------------"
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/locale
+	cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/share/locale/
+	@echo "Remove other .mo file not from gcompris"
+	find ./win32-install-dir/share/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f
+	@echo "Grab installed assetml files"
+	cp -r /usr/local/share/assetml $(GCOMPRIS_INSTALL_DIR)/share/
+	@echo "Copy pixmap"
+	mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
+	cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
+	@echo "Create the file gcompris-win-prepack.tar.gz"
+	tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis