Author: cazfi
Date: Mon Sep 7 22:47:10 2015
New Revision: 29811
URL: http://svn.gna.org/viewcvs/freeciv?rev=29811&view=rev
Log:
Added initial configure stuff for gtk3x-client. It's not possible to request
that client yet.
See patch #6316
Added:
trunk/m4/gtk3x-client.m4
Modified:
trunk/Makefile.am
trunk/configure.ac
Modified: trunk/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=29811&r1=29810&r2=29811&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Mon Sep 7 22:47:10 2015
@@ -50,6 +50,7 @@
m4/gtk-2.0.m4 \
m4/gtk2-client.m4 \
m4/gtk3-client.m4 \
+ m4/gtk3x-client.m4 \
m4/iconv.m4 \
m4/lib-ld.m4 \
m4/lib-link.m4 \
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=29811&r1=29810&r2=29811&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Sep 7 22:47:10 2015
@@ -800,6 +800,9 @@
dnl SDL-specific overrides
FC_SDL_CLIENT
+ dnl Gtk-3.x-specific overrides
+ FC_GTK3X_CLIENT
+
dnl Stub-specific overrides
if test "x$gui_stub" = "xyes" || test "x$client" = "xall" ; then
gui_stub=yes
@@ -818,6 +821,7 @@
if test "x$client" = "xall" ; then
if test "x$gui_gtk2" = "xyes" ||
test "x$gui_gtk3" = "xyes" ||
+ test "x$gui_gtk3x" = "xyes" ||
test "x$gui_sdl" = "xyes" ||
test "x$gui_sdl2" = "xyes" ||
test "x$gui_qt" = "xyes" ||
@@ -1042,6 +1046,9 @@
AC_SUBST([gui_gtk3_cflags])
AC_SUBST([gui_gtk3_libs])
AC_SUBST([gui_gtk3_ldflags])
+AC_SUBST([gui_gtk3x_cflags])
+AC_SUBST([gui_gtk3x_libs])
+AC_SUBST([gui_gtk3x_ldflags])
AC_SUBST([gui_sdl_cflags])
AC_SUBST([gui_sdl_libs])
AC_SUBST([gui_sdl_ldflags])
@@ -1082,6 +1089,7 @@
AM_CONDITIONAL(CLIENT_GUI_SDL2, test "x$gui_sdl2" = "xyes")
AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "x$gui_gtk2" = "xyes")
AM_CONDITIONAL(CLIENT_GUI_GTK_3_0, test "x$gui_gtk3" = "xyes")
+AM_CONDITIONAL(CLIENT_GUI_GTK_3_X, test "x$gui_gtk3x" = "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")
Added: trunk/m4/gtk3x-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3x-client.m4?rev=29811&view=auto
==============================================================================
--- trunk/m4/gtk3x-client.m4 (added)
+++ trunk/m4/gtk3x-client.m4 Mon Sep 7 22:47:10 2015
@@ -0,0 +1,31 @@
+# Try to configure the GTK+-3.x client (gui-gtk-3.x)
+
+# FC_GTK3X_CLIENT
+# Test for GTK+-3.0 libraries needed for gui-gtk-3.x
+
+AC_DEFUN([FC_GTK3X_CLIENT],
+[
+ # Add check "x$client" = "xauto" when this becomes supported client
+ if test "x$gui_gtk3x" = "xyes" ||
+ test "x$client" = "xall" ; then
+ PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.8.0],
+ [
+ GTK3X_CFLAGS="$GTK3X_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_8
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_8"
+ GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
+ gui_gtk3x=yes
+ if test "x$client" = "xauto" ; then
+ client=yes
+ fi
+ gui_gtk3x_cflags="$GTK3X_CFLAGS"
+ gui_gtk3x_libs="$GTK3X_LIBS"
+ if test "x$MINGW32" = "xyes"; then
+ dnl Required to compile gtk3 on Windows platform
+ gui_gtk3x_cflags="$gui_gtk3x_cflags -mms-bitfields"
+ gui_gtk3x_ldflags="$gui_gtk3x_ldflags -mwindows"
+ fi
+ ],
+ [
+ FC_NO_CLIENT([gtk3x], [GTK+-3.0 libraries not found])
+ ])
+ fi
+])
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
