Author: cazfi
Date: Tue Dec 22 20:46:53 2015
New Revision: 31157
URL: http://svn.gna.org/viewcvs/freeciv?rev=31157&view=rev
Log:
Plumbed gtk3x client to build system
See patch #6057
Modified:
trunk/client/Makefile.am
trunk/client/gui-gtk-3.x/Makefile.am
trunk/client/gui-gtk-3.x/gui_main.c
trunk/configure.ac
trunk/data/Makefile.am
Modified: trunk/client/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/Makefile.am?rev=31157&r1=31156&r2=31157&view=diff
==============================================================================
--- trunk/client/Makefile.am (original)
+++ trunk/client/Makefile.am Tue Dec 22 20:46:53 2015
@@ -29,6 +29,9 @@
freeciv.desktop
appdatafile_DATA += \
freeciv-gtk3.appdata.xml
+endif
+if CLIENT_GUI_GTK_3_X
+GUI_SUBDIRS += gui-gtk-3.x
endif
if CLIENT_GUI_QT
GUI_SUBDIRS += gui-qt
@@ -211,6 +214,22 @@
$(gui_gtk3_libs)
endif
+if CLIENT_GUI_GTK_3_X
+bin_PROGRAMS += freeciv-gtk3x
+noinst_LTLIBRARIES += libfcgui-gtk3x.la
+libfcgui_gtk3x_la_SOURCES = $(freeciv_client_src)
+libfcgui_gtk3x_la_LIBADD = gui-gtk-3.x/libgui-gtk3x.la $(clientlibs)
+freeciv_gtk3x_SOURCES = dummy.c
+freeciv_gtk3x_LDFLAGS = $(gui_gtk3x_ldflags)
+freeciv_gtk3x_LDADD = \
+ $(SOUND_LIBS) \
+ libfcgui-gtk3x.la \
+ $(top_builddir)/common/libfreeciv.la \
+ $(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(CLIENTICON) \
+ $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
+ $(gui_gtk3x_libs)
+endif
+
if CLIENT_GUI_SDL2
bin_PROGRAMS += freeciv-sdl2
noinst_LTLIBRARIES += libfcgui-sdl2.la
Modified: trunk/client/gui-gtk-3.x/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/Makefile.am?rev=31157&r1=31156&r2=31157&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/Makefile.am (original)
+++ trunk/client/gui-gtk-3.x/Makefile.am Tue Dec 22 20:46:53 2015
@@ -1,14 +1,14 @@
## Process this file with automake to produce Makefile.in
-noinst_LTLIBRARIES = libgui-gtk3.la
+noinst_LTLIBRARIES = libgui-gtk3x.la
AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include \
-I$(top_srcdir)/utility -I$(top_srcdir)/common \
-I$(top_srcdir)/common/aicore -I$(top_srcdir)/common/scriptcore \
-I$(srcdir)/../agents -I$(srcdir)/../luascript \
-I$(top_srcdir)/dependencies/tinycthread \
- $(gui_gtk3_cflags) $(SOUND_CFLAGS)
+ $(gui_gtk3x_cflags) $(SOUND_CFLAGS)
-libgui_gtk3_la_SOURCES = \
+libgui_gtk3x_la_SOURCES = \
action_dialog.c \
canvas.c \
canvas.h \
@@ -94,4 +94,4 @@
wldlg.c \
wldlg.h
-libgui_gtk3_la_LIBADD = -lm
+libgui_gtk3x_la_LIBADD = -lm
Modified: trunk/client/gui-gtk-3.x/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/gui_main.c?rev=31157&r1=31156&r2=31157&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/gui_main.c (original)
+++ trunk/client/gui-gtk-3.x/gui_main.c Tue Dec 22 20:46:53 2015
@@ -102,7 +102,7 @@
#include "gui_main.h"
-const char *client_string = "gui-gtk-3.0";
+const char *client_string = "gui-gtk-3.x";
GtkWidget *map_canvas; /* GtkDrawingArea */
GtkWidget *map_horizontal_scrollbar;
@@ -1771,7 +1771,7 @@
**************************************************************************/
enum gui_type get_gui_type(void)
{
- return GUI_GTK3;
+ return GUI_GTK3x;
}
/**************************************************************************
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=31157&r1=31156&r2=31157&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Dec 22 20:46:53 2015
@@ -333,6 +333,7 @@
gui_gtk2=no
gui_gtk3=no
+gui_gtk3x=no
gui_sdl2=no
gui_qt=no
gui_stub=no
@@ -355,6 +356,8 @@
test "x$gui" = "xgtk30" ||
test "x$gui" = "xgtk-3.0" ; then
gui_gtk3=yes
+ elif test "x$gui" = "xgtk3x" ; then
+ gui_gtk3x=yes
elif test "x$gui" = "xgtk" ; then
AC_MSG_WARN([for requested client 'gtk' enabled gtk3-client, that has
changed since earlier versions])
gui_gtk3=yes
@@ -1523,6 +1526,7 @@
client/gui-sdl2/Makefile
client/gui-gtk-2.0/Makefile
client/gui-gtk-3.0/Makefile
+ client/gui-gtk-3.x/Makefile
client/gui-qt/Makefile
client/gui-stub/Makefile
client/luascript/Makefile
@@ -1610,6 +1614,7 @@
In-development client frontends:
(these are not yet ready for general use)
+ Gtk-3.x $gui_gtk3x
== Server ==
Build freeciv server: $server
Modified: trunk/data/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/Makefile.am?rev=31157&r1=31156&r2=31157&view=diff
==============================================================================
--- trunk/data/Makefile.am (original)
+++ trunk/data/Makefile.am Tue Dec 22 20:46:53 2015
@@ -24,6 +24,10 @@
if CLIENT_GUI_GTK_3_0
CLIENT_FILES += \
gtk3_menus.xml
+endif
+if CLIENT_GUI_GTK_3_X
+CLIENT_FILES += \
+ gtk3x_menus.xml
endif
else
CLIENT_FILES =
@@ -60,6 +64,7 @@
freeciv.rc-2.0 \
gtk2_menus.xml \
gtk3_menus.xml \
+ gtk3x_menus.xml \
database.lua \
amplio2.tilespec \
cimpletoon.tilespec \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
