[gcompris/gcomprixogoo] In progress windows port.

[Bruno Coudoin <bcoudoin src gnome org>]

commit eb987fc94d5b76c428179bb71c0703a230ceec26
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Thu Jan 14 00:32:21 2010 +0100

    In progress windows port.

 Makefile.mingw.in     |   18 +++++++++++-------
 global_win32.mak      |    4 +---
 src/gcompris/board.c  |    3 +++
 tools/py2exe/setup.py |    8 +++++---
 4 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index d71ef09..cfec559 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -58,6 +58,10 @@ activity_dir = advanced_colors-activity \
 
 include global_win32.mak
 
+MSVCR90_DLL = $(LOCAL_PREFIX)/msvcm90.dll \
+	$(LOCAL_PREFIX)/msvcp90.dll \
+	$(LOCAL_PREFIX)/msvcr90.dll
+
 # These will be copied in the win32-install-dir ready to be packaged.
 NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(GNUCHESS_TOP)/bin/libreadline.dll \
@@ -87,7 +91,7 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(GTK_TOP)/bin/zlib1.dll \
 			$(ICONV_TOP)/bin/iconv.dll \
 			$(LIBXML2_TOP)/bin/libxml2.dll \
-			$(MSVCR71_DLL) \
+			$(MSVCR90_DLL) \
 			$(SDL_TOP)/bin/SDL.dll \
 			$(SDL_TOP)/bin/SDL_mixer.dll \
 			$(SDL_TOP)/bin/libogg-0.dll \
@@ -147,17 +151,17 @@ prepack: Makefile.mingw
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib
 	cp -r $(GTK_TOP)/share/locale $(GCOMPRIS_INSTALL_DIR)/lib
 	cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
-	cp $(GCOMPRIS_INSTALL_DIR)/libxml2.dll $(GCOMPRIS_INSTALL_DIR)/libxml2-2.dll
+	cp $(LOCAL_PREFIX)/libxml2-2.7.6.win32/bin/libxml2.dll $(GCOMPRIS_INSTALL_DIR)/libxml2-2.dll
 
 python: Makefile.mingw
-#	cp $(PYTHON_TOP)/DLLs/tcl84.dll $(GCOMPRIS_INSTALL_DIR)
-#	cp $(PYTHON_TOP)/DLLs/tk84.dll $(GCOMPRIS_INSTALL_DIR)
+	cp $(PYTHON_TOP)/DLLs/tcl85.dll $(GCOMPRIS_INSTALL_DIR)
+	cp $(PYTHON_TOP)/DLLs/tk85.dll $(GCOMPRIS_INSTALL_DIR)
 	cp $(PYTHON_TOP)/python26.dll $(GCOMPRIS_INSTALL_DIR)
 	cp tools/py2exe/gcompris.py $(GCOMPRIS_INSTALL_DIR)
 	cp tools/py2exe/setup.py $(GCOMPRIS_INSTALL_DIR)
-	cd $(GCOMPRIS_INSTALL_DIR);$(PYTHON_TOP)/python.exe setup.py py2exe;cp dist/library.zip python24.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd ..
-	rm -f $(GCOMPRIS_INSTALL_DIR)/tcl84.dll
-	rm -f $(GCOMPRIS_INSTALL_DIR)/tk84.dll
+	cd $(GCOMPRIS_INSTALL_DIR);$(PYTHON_TOP)/python.exe setup.py py2exe;cp dist/library.zip python26.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd ..
+	rm -f $(GCOMPRIS_INSTALL_DIR)/tcl85.dll
+	rm -f $(GCOMPRIS_INSTALL_DIR)/tk85.dll
 
 installer: Makefile.mingw gcompris-installer.nsi
 	$(MAKENSIS) gcompris-installer.nsi
diff --git a/global_win32.mak b/global_win32.mak
index 75e72e9..990d7b5 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -42,12 +42,10 @@ DEFINES += 	-DHAVE_CONFIG_H
 ifneq ($(CROSSCOMPILER),)
 	# CROSS COMPILATION
 	LOCAL_PREFIX:=/home/bruno/Projets/gcompris/windows
-	MSVCR71_DLL:=$(LOCAL_PREFIX)/msvcr71.dll
 	MAKENSIS:=makensis
 else
 	# MSYS CASE
-	LOCAL_PREFIX:=
-	MSVCR71_DLL:=/c/WINDOWS/system32/msvcr71.dll
+	LOCAL_PREFIX:=/X
 	MAKENSIS:="/c/Program Files/NSIS/makensis.exe"
 endif
 
diff --git a/src/gcompris/board.c b/src/gcompris/board.c
index 0b81409..2a7c75f 100644
--- a/src/gcompris/board.c
+++ b/src/gcompris/board.c
@@ -57,6 +57,7 @@ extern BoardPlugin * get_menu_bplugin_info();
 extern BoardPlugin * get_missingletter_bplugin_info();
 extern BoardPlugin * get_money_bplugin_info();
 extern BoardPlugin * get_paratrooper_bplugin_info();
+extern BoardPlugin * get_photohunter_bplugin_info();
 extern BoardPlugin * get_planegame_bplugin_info();
 extern BoardPlugin * get_railroad_bplugin_info();
 extern BoardPlugin * get_read_colors_bplugin_info();
@@ -113,6 +114,7 @@ void gc_board_init(void)
   static_boards_demo[i++] = get_menu_bplugin_info();
   static_boards_demo[i++] = get_money_bplugin_info();
   static_boards_demo[i++] = get_reading_bplugin_info();
+  static_boards_demo[i++] = get_photohunter_bplugin_info();
   static_boards_demo[i++] = get_python_bplugin_info();
   static_boards_demo[i++] = get_scale_bplugin_info();
   static_boards_demo[i++] = get_submarine_bplugin_info();
@@ -152,6 +154,7 @@ void gc_board_init(void)
   static_boards[i++] = get_missingletter_bplugin_info();
   static_boards[i++] = get_money_bplugin_info();
   static_boards[i++] = get_paratrooper_bplugin_info();
+  static_boards[i++] = get_photohunter_bplugin_info();
   static_boards[i++] = get_planegame_bplugin_info();
   static_boards[i++] = get_python_bplugin_info();
   static_boards[i++] = get_railroad_bplugin_info();
diff --git a/tools/py2exe/setup.py b/tools/py2exe/setup.py
index 66e51de..d54620c 100755
--- a/tools/py2exe/setup.py
+++ b/tools/py2exe/setup.py
@@ -4,7 +4,7 @@ import py2exe
 setup(
     name = 'gcompris',
     description = 'gcompris',
-    version = '8.2',
+    version = '9.0',
 
     windows = [
                   {
@@ -19,6 +19,8 @@ setup(
                   }
               },
 
-    data_files=[
-               ]
+    data_files= [
+                  ("Microsoft.VC90.CRT", py26MSdll),
+                  ("lib\Microsoft.VC90.CRT", py26MSdll)
+                ]
 )