Victor STINNER wrote:
- SDL_net.dll is missing

I'm currently uploading a fixed installer. Fix for SVN is attached ("SDL_net_setup.diff")

- Wormux don't use french translation (i18n doesn't work): may be a
problem of directory

It does work on what I've installed. If you check the properties of wormux.exe (for instance, in "explorer"/"explorateur", by right-clicking it and selecting "properties"/"propriétés"), you can see various information, amongst which, commentaries. It shall display "localization support: yes". Check wormux.rc to see how this is performed I you don't believe in such information.

So I guess it is a folder problem. I tried a cleaner solution by modifying configure.ac so that it spits the proper pathes, hence reducing the code paths in config.cpp. From what the updated configure printed, it seems to work. Fix for SVN attached ("win_path.diff"). However, after this, people shouldn't run install (because paths are now meaningless); this could be fixed by having the install target build the installer under a WIN32="yes" platform.

A working sdl_net.dll is attached to this email.

Not included in my setup, as I'm using the one corresponding to my devel 
package.

Best regards,
Kurosu
Index: configure.ac
===================================================================
--- configure.ac        (revision 802)
+++ configure.ac        (working copy)
@@ -76,14 +76,27 @@
   prefix="${ac_default_prefix}"
 fi
 
-DATADIR="${prefix}/share/wormux"
+# ========================================================================
+# == Set flags for various environments                                  =
+# ========================================================================
+case "${host}" in
+  i[[3456789]]86-*-mingw32*) WIN32="yes" ;;
+  *cygwin*) WIN32="yes" ;;
+  *) WIN32="no" ;;
+esac
+AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
+
+
+if test "${WIN32}" = "yes"; then DATADIR="data"
+else DATADIR="${prefix}/share/wormux"; fi
 AC_ARG_WITH(datadir-name,
     [  --with-datadir-name=DIR       specify where datas are installed 
(default: ${prefix}/share/wormux)],
     [DATADIR="$withval"])
 AC_SUBST([DATADIR])
 
 
-LOCALEDIR="${prefix}/share/locale"
+if test "${WIN32}" = "yes"; then LOCALEDIR="locale"
+else LOCALEDIR="${prefix}/share/locale"; fi
 AC_ARG_WITH(localedir-name,
     [  --with-localedir-name=DIR       specify where locales are installed 
(default: ${prefix}/share/locale)],
     [LOCALEDIR="$withval"])
@@ -245,17 +258,6 @@
 LIBS="$LIBS $LIBXMLPP_LIBS"
 
 dnl ========================================================================
-dnl == Set flags for various environments                                  =
-dnl ========================================================================
-case "${host}" in
-  i[[3456789]]86-*-mingw32*) WIN32="yes" ;;
-  *cygwin*) WIN32="yes" ;;
-  *) WIN32="no" ;;
-esac
-AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
-
-
-dnl ========================================================================
 dnl == Check for header files                                              =
 dnl ========================================================================
 
Index: src/game/config.cpp
===================================================================
--- src/game/config.cpp (revision 802)
+++ src/game/config.cpp (working copy)
@@ -82,15 +82,13 @@
   Constants::GetInstance();
 
   // directories
-#ifndef WIN32
   data_dir = *GetEnv(Constants::ENV_DATADIR, Constants::DEFAULT_DATADIR);
   locale_dir = *GetEnv(Constants::ENV_LOCALEDIR, Constants::DEFAULT_LOCALEDIR);
   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 802)
+++ tools/win32_setup/create_setup.sh   (working copy)
@@ -173,7 +173,7 @@
 SDL_PATH=$(sdl-config --prefix)
 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
+   "$SDL_PATH/bin/SDL_net.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 à