Author: cazfi
Date: Tue Feb 16 14:07:59 2016
New Revision: 31934

URL: http://svn.gna.org/viewcvs/freeciv?rev=31934&view=rev
Log:
Do not assume that Mingw is mingw32, but handle also mingw64 identically.

See patch #6958

Modified:
    branches/S2_6/client/Makefile.am
    branches/S2_6/configure.ac
    branches/S2_6/m4/gtk2-client.m4
    branches/S2_6/m4/gtk3-client.m4
    branches/S2_6/server/Makefile.am
    branches/S2_6/tools/Makefile.am
    branches/S2_6/win32/Makefile.am

Modified: branches/S2_6/client/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/Makefile.am?rev=31934&r1=31933&r2=31934&view=diff
==============================================================================
--- branches/S2_6/client/Makefile.am    (original)
+++ branches/S2_6/client/Makefile.am    Tue Feb 16 14:07:59 2016
@@ -57,7 +57,7 @@
 AUDIO_SDL_FILES=$(ALL_AUDIO_SDL_FILES)
 endif
 
-if MINGW32
+if MINGW
 CLIENTICON=../win32/clienticon.o
 endif
 

Modified: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31934&r1=31933&r2=31934&view=diff
==============================================================================
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Tue Feb 16 14:07:59 2016
@@ -174,17 +174,17 @@
 AM_CONDITIONAL(SERVER, test x$server = xyes)
 
 dnl Host type variable defaults
-MINGW32=no
+MINGW=no
 AMIGA=no
 
 dnl Settings specific to host OS
 case "$host_os" in
 
-  *mingw32*)
+  *mingw*)
     dnl Windows-specific settings
-    MINGW32=yes
-    FC_WINSOCK2_INCLUDE([AC_DEFINE([FREECIV_HAVE_WINSOCK2], [1], 
[Mingw32-specific setting - winsock2])])
-    AC_DEFINE([FREECIV_HAVE_WINSOCK], [1], [Mingw32-specific setting - 
winsock])
+    MINGW=yes
+    FC_WINSOCK2_INCLUDE([AC_DEFINE([FREECIV_HAVE_WINSOCK2], [1], 
[Mingw-specific setting - winsock2])])
+    AC_DEFINE([FREECIV_HAVE_WINSOCK], [1], [Mingw-specific setting - winsock])
     AC_CHECK_HEADERS([ws2tcpip.h], [AC_DEFINE([FREECIV_HAVE_WS2TCPIP_H], [1], 
[ws2tcpip.h available])])
     AC_CHECK_HEADERS([direct.h])
 
@@ -198,7 +198,7 @@
 
 dnl Avoid including the unix emulation layer if we build mingw executables
 dnl There would be type conflicts between winsock and bsd/unix includes
-if test "x$MINGW32" != "xyes"; then
+if test "x$MINGW" != "xyes"; then
   AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([FREECIV_HAVE_SYS_SOCKET_H], 
[1], [sys/socket.h available])])
 fi
 
@@ -680,7 +680,7 @@
 dnl Settings specific to host OS
 case "$host_os" in
 
-  *mingw32*)
+  *mingw*)
     dnl Windows-specific settings
     AC_CHECK_TOOL([WINDRES], [windres])
     if test -z $WINDRES; then
@@ -689,9 +689,9 @@
 
     HOST_PATH_SEPARATOR=";"
 
-    AC_DEFINE([SOCKET_ZERO_ISNT_STDIN], [1], [Mingw32-specific setting - 
stdin])
-    AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw32])
-    AC_DEFINE([WIN32_NATIVE], [1], [Mingw32-specific setting - native])
+    AC_DEFINE([SOCKET_ZERO_ISNT_STDIN], [1], [Mingw-specific setting - stdin])
+    AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw])
+    AC_DEFINE([WIN32_NATIVE], [1], [Mingw-specific setting - native])
     AC_DEFINE([NONBLOCKING_SOCKETS], [1], [nonblocking sockets support])
     ;;
 
@@ -720,7 +720,7 @@
 fi
 
 dnl note this has to match the path installed by translations/freeciv/Makefile
-if test x"$MINGW32" != "xyes"; then
+if test x"$MINGW" != "xyes"; then
   CPPFLAGS="$CPPFLAGS -DLOCALEDIR=\"\\\"$localedir\\\"\""
 else
   AC_DEFINE_UNQUOTED([LOCALEDIR], ["./share/locale"], [Locale directory 
(windows)])
@@ -780,7 +780,7 @@
   no)  crosser=no ;;
   *)   AC_MSG_ERROR([bad value ${enableval} for --enable-crosser]) ;;
 esac], [crosser=no])
-if test x$crosser = xyes && test x$MINGW32 != xyes ; then
+if test x$crosser = xyes && test x$MINGW != xyes ; then
   AC_MSG_ERROR([--enable-crosser is Windows build specific option])
 fi
 
@@ -968,7 +968,7 @@
   fcmp_list="$fcmp_list gtk3"
   mp_gtk3_cflags="$GTK3MP_CFLAGS $GHTREAD_GTK3_CFLAGS"
   mp_gtk3_libs="$GTK3MP_LIBS $GTHREAD_GTK3_LIBS"
-  if test "x$MINGW32" = "xyes"; then
+  if test "x$MINGW" = "xyes"; then
     dnl Required to compile gtk3 on Windows platform
     mp_gtk3_cflags="$mp_gtk3_cflags -mms-bitfields"
     mp_gtk3_ldflags="$mp_gtk3_ldflags -mwindows"
@@ -994,7 +994,7 @@
   fcmp_list="$fcmp_list gtk2"
   mp_gtk2_cflags="$GTK2_CFLAGS $GTHREAD_GTK2_CFLAGS"
   mp_gtk2_libs="$GTK2_LIBS $GTHREAD_GTK2_LIBS"
-  if test "x$MINGW32" = "xyes"; then
+  if test "x$MINGW" = "xyes"; then
      dnl Required to compile gtk2 on Windows platform
      mp_gtk2_cflags="$mp_gtk2_cflags -mms-bitfields"
      mp_gtk2_ldflags="$mp_gtk2_ldflags -mwindows"
@@ -1051,7 +1051,7 @@
   AC_MSG_ERROR([Cannot build modpack installer with any gui])
 fi 
 
-if test "x$modinst" != "xno" && test "x$MINGW32" != "xyes" ; then
+if test "x$modinst" != "xno" && test "x$MINGW" != "xyes" ; then
   dnl Hack to get a run-time icon -- not needed on Windows
   mp_gtk2_cflags="$mp_gtk2_cflags 
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
   mp_gtk3_cflags="$mp_gtk3_cflags 
-DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\""
@@ -1152,7 +1152,7 @@
 AM_CONDITIONAL(CLIENT_GUI_XAW, test "x$gui_xaw" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_QT, test "x$gui_qt" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_STUB, test "x$gui_stub" = "xyes")
-AM_CONDITIONAL(MINGW32, test x"$MINGW32" = "xyes")
+AM_CONDITIONAL(MINGW, test x"$MINGW" = "xyes")
 
 dnl Additional client libraries:
 if test "x$client" = "xyes"; then
@@ -1194,7 +1194,7 @@
 
 dnl Avoid including the unix emulation layer if we build mingw executables
 dnl There would be type conflicts between winsock and bsd/unix includes
-if test "x$MINGW32" != "xyes"; then
+if test "x$MINGW" != "xyes"; then
   AC_CHECK_HEADERS([arpa/inet.h netdb.h sys/ioctl.h \
                     sys/signal.h sys/termio.h \
                     sys/uio.h termios.h])
@@ -1239,7 +1239,7 @@
 AC_FUNC_VPRINTF
 
 dnl Windows vsnprintf doesn't support argument reordering (see PR#12932)
-if test "x$MINGW32" != "xyes"; then
+if test "x$MINGW" != "xyes"; then
 AC_FUNC_VSNPRINTF
 AC_CHECK_FUNCS([vsnprintf])
 fi
@@ -1275,7 +1275,7 @@
 dnl deliberate.
 
 dnl Windows fdopen does not work with sockets.
-if test "x$MINGW32" != "xyes"; then
+if test "x$MINGW" != "xyes"; then
   AC_CHECK_FUNCS(fdopen)
 fi
 
@@ -1301,7 +1301,7 @@
 dnl export where the datadir is going to be installed
 FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
 
-if test x"$MINGW32" = xyes; then
+if test x"$MINGW" = xyes; then
   DEFAULT_SAVE_PATH=".;~/.freeciv/saves"
   if test x$crosser = xyes ; then
     FC_CONF_PATH="../etc/freeciv"

Modified: branches/S2_6/m4/gtk2-client.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/gtk2-client.m4?rev=31934&r1=31933&r2=31934&view=diff
==============================================================================
--- branches/S2_6/m4/gtk2-client.m4     (original)
+++ branches/S2_6/m4/gtk2-client.m4     Tue Feb 16 14:07:59 2016
@@ -15,7 +15,7 @@
         fi
         gui_gtk2_cflags="$GTK2_CFLAGS"
         gui_gtk2_libs="$GTK2_LIBS"
-        if test "x$MINGW32" = "xyes"; then
+        if test "x$MINGW" = "xyes"; then
           dnl Required to compile gtk2 on Windows platform
           gui_gtk2_cflags="$gui_gtk2_cflags -mms-bitfields"
           gui_gtk2_ldflags="$gui_gtk2_ldflags -mwindows"

Modified: branches/S2_6/m4/gtk3-client.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/gtk3-client.m4?rev=31934&r1=31933&r2=31934&view=diff
==============================================================================
--- branches/S2_6/m4/gtk3-client.m4     (original)
+++ branches/S2_6/m4/gtk3-client.m4     Tue Feb 16 14:07:59 2016
@@ -17,7 +17,7 @@
         fi
         gui_gtk3_cflags="$GTK3_CFLAGS"
         gui_gtk3_libs="$GTK3_LIBS"
-        if test "x$MINGW32" = "xyes"; then
+        if test "x$MINGW" = "xyes"; then
           dnl Required to compile gtk3 on Windows platform
           gui_gtk3_cflags="$gui_gtk3_cflags -mms-bitfields"
           gui_gtk3_ldflags="$gui_gtk3_ldflags -mwindows"

Modified: branches/S2_6/server/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/Makefile.am?rev=31934&r1=31933&r2=31934&view=diff
==============================================================================
--- branches/S2_6/server/Makefile.am    (original)
+++ branches/S2_6/server/Makefile.am    Tue Feb 16 14:07:59 2016
@@ -25,7 +25,7 @@
        -I$(srcdir)/scripting \
        $(FCDB_MYSQL_CFLAGS) $(FCDB_POSTGRES_CFLAGS) $(FCDB_SQLITE3_CFLAGS)
 
-if MINGW32
+if MINGW
 SERVERICON=../win32/servericon.o
 endif
 

Modified: branches/S2_6/tools/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/Makefile.am?rev=31934&r1=31933&r2=31934&view=diff
==============================================================================
--- branches/S2_6/tools/Makefile.am     (original)
+++ branches/S2_6/tools/Makefile.am     Tue Feb 16 14:07:59 2016
@@ -45,7 +45,7 @@
 
 AM_CPPFLAGS = $(common_cppflags)
 
-if MINGW32
+if MINGW
 MPICON = $(top_builddir)/win32/mpicon.o
 else
 desktopfiledir = @DESKTOPDIR@

Modified: branches/S2_6/win32/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/Makefile.am?rev=31934&r1=31933&r2=31934&view=diff
==============================================================================
--- branches/S2_6/win32/Makefile.am     (original)
+++ branches/S2_6/win32/Makefile.am     Tue Feb 16 14:07:59 2016
@@ -45,7 +45,7 @@
                installer_msys2/Makefile                        \
                installer_msys2/win_arch.sh
 
-if MINGW32
+if MINGW
 nodist_noinst_DATA =           \
                clienticon.o    \
                mpicon.o        \


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to