[gcompris/gcomprixogoo] upgraded windows compilation chain to use a mode recent sdl_mixer and put it in its own directory.

[Bruno Coudoin <bcoudoin src gnome org>]

commit 825d276f6631ad39cfab07c0372fd0fb37f9f6d0
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Thu Apr 22 01:25:12 2010 +0200

    upgraded windows compilation chain to use a mode recent sdl_mixer
    and put it in its own directory.

 Makefile.mingw.in           |    8 ++++----
 global_win32.mak            |    1 +
 src/gcompris/Makefile.mingw |    2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index 7fdc08a..bc9d6aa 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -88,10 +88,10 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(LIBXML2_TOP)/bin/libxml2.dll \
 			$(MSVCR90_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 \
 			$(RSVG_TOP)/bin/librsvg-2-2.dll \
 			$(CROCO_TOP)/bin/libcroco-0.6-3.dll \
diff --git a/global_win32.mak b/global_win32.mak
index dbe3587..affb056 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -57,6 +57,7 @@ CROCO_TOP :=		$(LOCAL_PREFIX)/gtk
 GSF_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)/Python26
 GNUCAP_TOP :=		$(LOCAL_PREFIX)/gnucap
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index 92c135d..cb40920 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -47,6 +47,7 @@ INCLUDE_PATHS +=	-I$(INCLUDE_DIR) \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/include/freetype2 \
 			-I$(SDL_TOP)/include/SDL \
+			-I$(SDLMIXER_TOP)/include \
 			-I$(LIBXML2_TOP)/include \
 			-I$(CAIRO_TOP)/include/cairo \
 			-I$(RSVG_TOP)/include/librsvg-2 \
@@ -61,6 +62,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) \