Author: sveinung
Date: Mon May 22 12:06:30 2017
New Revision: 35692

URL: http://svn.gna.org/viewcvs/freeciv?rev=35692&view=rev
Log:
Implement fc_interface for ruledit and ruleup.

Use the tools_fc_interface module.

See hrm Feature #659409

Modified:
    branches/S3_0/tools/Makefile.am
    branches/S3_0/tools/ruledit/Makefile.am
    branches/S3_0/tools/ruledit/ruledit.cpp
    branches/S3_0/tools/ruleup.c

Modified: branches/S3_0/tools/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/tools/Makefile.am?rev=35692&r1=35691&r2=35692&view=diff
==============================================================================
--- branches/S3_0/tools/Makefile.am     (original)
+++ branches/S3_0/tools/Makefile.am     Mon May 22 12:06:30 2017
@@ -91,6 +91,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: branches/S3_0/tools/ruledit/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/tools/ruledit/Makefile.am?rev=35692&r1=35691&r2=35692&view=diff
==============================================================================
--- branches/S3_0/tools/ruledit/Makefile.am     (original)
+++ branches/S3_0/tools/ruledit/Makefile.am     Mon May 22 12:06:30 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
 
@@ -82,6 +83,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: branches/S3_0/tools/ruledit/ruledit.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/tools/ruledit/ruledit.cpp?rev=35692&r1=35691&r2=35692&view=diff
==============================================================================
--- branches/S3_0/tools/ruledit/ruledit.cpp     (original)
+++ branches/S3_0/tools/ruledit/ruledit.cpp     Mon May 22 12:06:30 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: branches/S3_0/tools/ruleup.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/tools/ruleup.c?rev=35692&r1=35691&r2=35692&view=diff
==============================================================================
--- branches/S3_0/tools/ruleup.c        (original)
+++ branches/S3_0/tools/ruleup.c        Mon May 22 12:06:30 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

Reply via email to