[gcompris] Updated windows compilation with mingw32

[Bruno Coudoin <bcoudoin src gnome org>]

commit b77ce8133bd5f561ff2dc4c3a3f13f456490bdd1
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Thu Apr 22 01:06:31 2010 +0200

    Updated windows compilation with mingw32

 Makefile.mingw.in           |   10 +++++-----
 autogen.sh                  |   15 ++++++++-------
 global_win32.mak            |    1 +
 install-sh                  |    5 +++--
 src/gcompris/Makefile.mingw |    2 ++
 5 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index 57cdd89..a3cde4a 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -23,7 +23,7 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(GNUCAP_TOP)/src/MSW/gnucap.exe \
 			$(GTK_TOP)/bin/gspawn-win32-helper.exe \
 			$(GTK_TOP)/bin/intl.dll \
-			$(GTK_TOP)/bin/jpeg62.dll \
+			$(GTK_TOP)/bin/libjpeg-7.dll \
 			$(GTK_TOP)/bin/libatk-1.0-0.dll \
 			$(GTK_TOP)/bin/libcairo-2.dll \
 			$(GTK_TOP)/bin/libgdk-win32-2.0-0.dll \
@@ -44,10 +44,10 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(LIBXML2_TOP)/bin/libxml2.dll \
 			$(MSVCR71_DLL) \
 			$(SDL_TOP)/bin/SDL.dll \
-			$(SDL_TOP)/bin/SDL_mixer.dll \
-			$(SDL_TOP)/bin/libogg-0.dll \
-			$(SDL_TOP)/bin/libvorbis-0.dll \
-			$(SDL_TOP)/bin/libvorbisfile-3.dll \
+			$(SDLMIXER_TOP)/bin/SDL_mixer.dll \
+			$(SDLMIXER_TOP)/bin/libogg-0.dll \
+			$(SDLMIXER_TOP)/bin/libvorbis-0.dll \
+			$(SDLMIXER_TOP)/bin/libvorbisfile-3.dll \
 			$(SQLITE_TOP)/sqlite3.dll
 
 NEEDED_FILES =		README \
diff --git a/autogen.sh b/autogen.sh
index 4280dee..7c64661 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,14 +6,15 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gcompris"
 
-(test -f $srcdir/configure.in) || {
+(test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level directory"
+    echo " top-level $PKG_NAME directory"
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.6 \
-USE_GNOME2_MACROS=1 \
-BUILD_PATH="$srcdir" \
-srcdir="$srcdir" \
-. $srcdir/gnome2-macros/gnome-autogen.sh
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME GIT"
+    exit 1
+}
+
+REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/global_win32.mak b/global_win32.mak
index 8d642bc..05b3d3d 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -56,6 +56,7 @@ GLIB_TOP :=		$(LOCAL_PREFIX)/gtk
 CAIRO_TOP :=		$(LOCAL_PREFIX)/gtk
 LIBXML2_TOP :=		$(LOCAL_PREFIX)/libxml2
 SDL_TOP :=		$(LOCAL_PREFIX)/sdl
+SDLMIXER_TOP :=		$(LOCAL_PREFIX)/sdl_mixer
 GNUCHESS_TOP :=		$(LOCAL_PREFIX)/gnuchess
 PYTHON_TOP :=		$(LOCAL_PREFIX)/Python24
 GNUCAP_TOP :=		$(LOCAL_PREFIX)/gnucap
diff --git a/install-sh b/install-sh
index a5897de..6781b98 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index f9d8d55..30d2154 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -55,6 +55,7 @@ INCLUDE_PATHS +=	-I$(INCLUDE_DIR) \
 			-I$(LIBART_TOP) \
 			-I$(GTK_TOP)/include/freetype2 \
 			-I$(SDL_TOP)/include/SDL \
+			-I$(SDLMIXER_TOP)/include \
 			-I$(LIBXML2_TOP)/include \
 			-I$(CAIRO_TOP)/include/cairo \
 			-I$(SQLITE_TOP) \
@@ -67,6 +68,7 @@ LIB_PATHS =		-L$(GTK_TOP)/lib \
 	  		-L$(GLIB_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
 			-L$(SDL_TOP)/lib \
+			-L$(SDLMIXER_TOP)/bin \
 			-L$(CANVAS_TOP) \
 			-L$(PYTHON_TOP)/libs \
 			-L$(SQLITE_TOP) \