Author: sveinung Date: Mon May 22 12:05:42 2017 New Revision: 35688 URL: http://svn.gna.org/viewcvs/freeciv?rev=35688&view=rev Log: Implement fc_interface for ruledit and ruleup.
Use the tools_fc_interface module. See hrm Feature #659409 Modified: trunk/tools/Makefile.am trunk/tools/ruledit/Makefile.am trunk/tools/ruledit/ruledit.cpp trunk/tools/ruleup.c Modified: trunk/tools/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/Makefile.am?rev=35688&r1=35687&r2=35688&view=diff ============================================================================== --- trunk/tools/Makefile.am (original) +++ trunk/tools/Makefile.am Mon May 22 12:05:42 2017 @@ -81,6 +81,7 @@ $(top_builddir)/server/libfreeciv-srv.la \ $(top_builddir)/common/libfreeciv.la \ $(top_builddir)/tools/ruleutil/libfcruleutil.la \ + $(top_builddir)/tools/shared/libtoolsshared.la \ $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) $(SERVER_LIBS) if FCMANUAL Modified: trunk/tools/ruledit/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/Makefile.am?rev=35688&r1=35687&r2=35688&view=diff ============================================================================== --- trunk/tools/ruledit/Makefile.am (original) +++ trunk/tools/ruledit/Makefile.am Mon May 22 12:05:42 2017 @@ -18,6 +18,7 @@ -I$(top_srcdir)/common \ -I$(top_srcdir)/common/networking \ -I$(top_srcdir)/server \ + -I$(top_builddir)/tools/shared \ -I$(top_srcdir)/tools/ruleutil \ -I$(top_srcdir)/dependencies/tinycthread @@ -85,6 +86,7 @@ $(top_builddir)/server/libfreeciv-srv.la \ $(top_builddir)/common/libfreeciv.la \ $(top_builddir)/tools/ruleutil/libfcruleutil.la \ + $(top_builddir)/tools/shared/libtoolsshared.la \ $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) $(SERVER_LIBS) CLEANFILES = $(MOC_FILES) Modified: trunk/tools/ruledit/ruledit.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit.cpp?rev=35688&r1=35687&r2=35688&view=diff ============================================================================== --- trunk/tools/ruledit/ruledit.cpp (original) +++ trunk/tools/ruledit/ruledit.cpp Mon May 22 12:05:42 2017 @@ -39,6 +39,9 @@ /* server */ #include "sernet.h" #include "settings.h" + +/* tools/shared */ +#include "tools_fc_interface.h" /* ruledit */ #include "comments.h" @@ -99,6 +102,9 @@ game_init(FALSE); i_am_tool(); + + /* Initialize the fc_interface functions needed to understand rules. */ + fc_interface_init_tool(); if (comments_load()) { ruledit_qt_run(ui_options, argv); Modified: trunk/tools/ruleup.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleup.c?rev=35688&r1=35687&r2=35688&view=diff ============================================================================== --- trunk/tools/ruleup.c (original) +++ trunk/tools/ruleup.c Mon May 22 12:05:42 2017 @@ -33,6 +33,9 @@ #include "ruleset.h" #include "sernet.h" #include "settings.h" + +/* tools/shared */ +#include "tools_fc_interface.h" /* tools/ruleutil */ #include "comments.h" @@ -129,6 +132,9 @@ game_init(FALSE); i_am_tool(); + /* Initialize the fc_interface functions needed to understand rules. */ + fc_interface_init_tool(); + rup_parse_cmdline(argc, argv); /* Set ruleset user requested to use */ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits