I have updated files on my wormux dump page at http://kurosu.free.fr/wormux/

You can therefore find:
- The official 0.7.2: http://kurosu.free.fr/wormux/Wormux-Setup-0.7.2.exe
- completed+patched 0.7.2 source:
  http://kurosu.free.fr/wormux/Wormux-0.7.2-SOURCE-win32.zip
- SVN latest (1st June) with network support (not tested):
  http://kurosu.free.fr/wormux/Wormux-Setup-SVN20060601.exe

The 2 first files could be suitable for distribution if no further problems are encountered.

The 0.7.2 had to be fixed because of several problems:
1) Missing files (see https://mail.gna.org/public/wormux-dev/2006-04/msg00035.html ) 2) The FONT_DIR is set through Makefile based on $(datadir). This is not usable for a win32 build. This results in wormux looking for ttf font in /usr/local/share/wormux/data/font. This has to be fixed by either modifying the Makefile/autoconf files (long) or forcing the font filename in config.cpp. The attached patch performs the later.

I'm short on time for wormux, so this my last contribution until later on. I'll try to provide a new installer whenever sufficient feedback (see https://mail.gna.org/public/wormux-dev/2006-04/msg00077.html ) will have been provided on the currently available installers.

Best regards,
Kurosu

Index: src/game/config.cpp
===================================================================
--- src/game/config.cpp (revision 794)
+++ src/game/config.cpp (working copy)
@@ -85,15 +85,12 @@
 #ifndef WIN32
   data_dir = *GetEnv(Constants::ENV_DATADIR, Constants::DEFAULT_DATADIR);
   locale_dir = *GetEnv(Constants::ENV_LOCALEDIR, Constants::DEFAULT_LOCALEDIR);
-#else
-  data_dir = "data\\";
-  locale_dir = "locale\\";
-#endif
   ttf_filename = *GetEnv(Constants::ENV_FONT_PATH, 
Constants::DEFAULT_FONT_PATH);
-
-#ifndef WIN32
   personal_dir = GetHome()+"/.wormux/";
 #else
+  data_dir = "data\\";
+  locale_dir = "locale\\";
+  ttf_filename = "data\\font\\DejaVuSans.ttf";
   personal_dir = GetHome()+"\\Wormux\\";
 #endif
 }
Index: tools/win32_setup/create_setup.sh
===================================================================
--- tools/win32_setup/create_setup.sh   (revision 794)
+++ tools/win32_setup/create_setup.sh   (working copy)
@@ -2,7 +2,7 @@
 
 ## Programs 
 PKG_CONFIG=pkg-config
-MAKE_NSIS=makensis 
+MAKE_NSIS=makensis
 
 # Path to which all others are relative
 WORMUXDIR="../.."
@@ -148,15 +148,16 @@
   File "${WIN_WORMUXDIR}\src\wormux.exe"
 EOF
 
-# All gettext (with iconv), jpeg and zlib stuff
-cp $MINGWDIR/bin/libintl-3.dll $MINGWDIR/bin/libiconv-2.dll \
-   $MINGWDIR/bin/jpeg62.dll $MINGWDIR/bin/zlib1.dll $DEST
- 
 # Glib (gobject, gthread, glib & gmodule)
 GLIB_PATH=$(pkg_path glib-2.0)
 cp "$GLIB_PATH/bin/libgobject"*.dll "$GLIB_PATH/bin/libgthread"*.dll \
-   "$GLIB_PATH/bin/libglib"*.dll "$GLIB_PATH/bin/libgmodule"*.dll $DEST
+   "$GLIB_PATH/bin/libglib"*.dll "$GLIB_PATH/bin/libgmodule"*.dll "$DEST"
 
+# All gettext (with iconv), jpeg and zlib stuff should be within
+# glademm install path <=> glib path
+cp "$GLIB_PATH/bin/intl.dll" "$GLIB_PATH/bin/iconv.dll" \
+   "$GLIB_PATH/bin/jpeg62.dll" "$DEST"
+
 # Other libs
 cp "$(pkg_path sigc++-2.0)/bin/libsigc"*.dll $DEST
 cp "$(pkg_path libxml-2.0)/bin/libxml2"*.dll $DEST
@@ -165,13 +166,14 @@
 cp "$(pkg_path libpng13)/bin/libpng13.dll" $DEST
 
 # Clean up before non-strippable files
-strip $DEST/*.dll "$WORMUXDIR/src/*.exe"
+# WARNING Stripping some dlls corrupts them beyond use
+strip "$DEST/"*.dll "$WORMUXDIR/src/"*.exe
 
 # Files that must not be stripped (all of SDL)
 SDL_PATH=$(sdl-config --prefix)
-cp $MINGWDIR/bin/zlib1.dll "$SDL_PATH/bin/SDL_mixer.dll" \
-   "$SDL_PATH/bin/SDL_ttf.dll"  "$SDL_PATH/bin/SDL_image.dll" \
-   "$SDL_PATH/bin/SDL.dll" $DEST
+cp "$SDL_PATH/bin/SDL_mixer.dll" "$SDL_PATH/bin/SDL_ttf.dll" \
+   "$SDL_PATH/bin/SDL_image.dll" "$SDL_PATH/bin/SDL.dll" \
+   "$GLIB_PATH/bin/zlib1.dll" $DEST
 
 # Continue producing installer
 cat >> $NSIS <<EOF
_______________________________________________
Wormux-dev mailing list
[email protected]
https://mail.gna.org/listinfo/wormux-dev

Répondre à