Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. *Read more...*

Feature #802356 ยป 0020-Move-fcmp-files-from-tools-to-a-new-subdirectory-too.patch

Marko Lindqvist, 2019-02-12 10:12 PM

View differences:

configure.ac
server/generator/Makefile
server/scripting/Makefile
tools/Makefile
tools/fcmp/Makefile
tools/ruledit/Makefile
tools/ruleutil/Makefile
tools/shared/Makefile
......
client/freeciv-sdl2.desktop:bootstrap/freeciv-sdl2.desktop.in
client/freeciv-qt.desktop:bootstrap/freeciv-qt.desktop.in
server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in
tools/freeciv-mp-gtk3.desktop:bootstrap/freeciv-mp-gtk3.desktop.in
tools/freeciv-mp-qt.desktop:bootstrap/freeciv-mp-qt.desktop.in
tools/fcmp/freeciv-mp-gtk3.desktop:bootstrap/freeciv-mp-gtk3.desktop.in
tools/fcmp/freeciv-mp-qt.desktop:bootstrap/freeciv-mp-qt.desktop.in
tools/ruledit/freeciv-ruledit.desktop:bootstrap/freeciv-ruledit.desktop.in
client/freeciv-gtk3.appdata.xml:bootstrap/freeciv-gtk3.appdata.xml.in
client/freeciv-gtk3.22.appdata.xml:bootstrap/freeciv-gtk3.22.appdata.xml.in
client/freeciv-sdl2.appdata.xml:bootstrap/freeciv-sdl2.appdata.xml.in
client/freeciv-qt.appdata.xml:bootstrap/freeciv-qt.appdata.xml.in
server/freeciv-server.appdata.xml:bootstrap/freeciv-server.appdata.xml.in
tools/freeciv-mp-gtk3.appdata.xml:bootstrap/freeciv-mp-gtk3.appdata.xml.in
tools/freeciv-mp-qt.appdata.xml:bootstrap/freeciv-mp-qt.appdata.xml.in
tools/fcmp/freeciv-mp-gtk3.appdata.xml:bootstrap/freeciv-mp-gtk3.appdata.xml.in
tools/fcmp/freeciv-mp-qt.appdata.xml:bootstrap/freeciv-mp-qt.appdata.xml.in
tools/ruledit/freeciv-ruledit.appdata.xml:bootstrap/freeciv-ruledit.appdata.xml.in])
AC_CONFIG_FILES([fcgui:bootstrap/fcgui.in], [chmod +x fcgui])
AC_CONFIG_FILES([fcser:bootstrap/fcser.in], [chmod +x fcser])
tools/Makefile.am
## Process this file with automake to produce Makefile.in
SUBDIRS = shared ruleutil
SUBDIRS = shared ruleutil fcmp
if RULEDIT
SUBDIRS += ruledit
endif
MOCCMD=@MOCCMD@
include $(top_srcdir)/bootstrap/Makerules.mk
bin_PROGRAMS = freeciv-ruleup
......
endif
endif
if MODINST_CLI
bin_PROGRAMS += freeciv-mp-cli
endif
if MODINST_GTK3
bin_PROGRAMS += freeciv-mp-gtk3
endif
if MODINST_GTK3X
bin_PROGRAMS += freeciv-mp-gtk3x
endif
if MODINST_QT
bin_PROGRAMS += freeciv-mp-qt
endif
if MODINST
noinst_LTLIBRARIES = libfcmp.la
endif
common_cppflags = \
-I$(top_srcdir)/dependencies/cvercmp \
-I$(top_srcdir)/utility \
......
AM_CPPFLAGS = $(common_cppflags)
if MINGW
MPICON = $(top_builddir)/windows/mpicon.o
else
desktopfiledir = @DESKTOPDIR@
desktopfile_DATA =
appdatafiledir = @APPDATADIR@
appdatafile_DATA =
if MODINST_GTK3
desktopfile_DATA += \
freeciv-mp-gtk3.desktop
appdatafile_DATA += \
freeciv-mp-gtk3.appdata.xml
endif
if MODINST_QT
desktopfile_DATA += \
freeciv-mp-qt.desktop
appdatafile_DATA += \
freeciv-mp-qt.appdata.xml
endif
endif
freeciv_ruleup_SOURCES = \
ruleup.c
......
$(INTLLIBS) $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(SERVER_LIBS)
endif
libfcmp_la_SOURCES = \
download.c \
download.h \
modinst.c \
modinst.h \
mpcmdline.c \
mpcmdline.h \
mpdb.c \
mpdb.h
if MODINST_CLI
freeciv_mp_cli_CPPFLAGS = $(common_cppflags) $(mp_cli_cflags)
freeciv_mp_cli_SOURCES = mpcli.c
freeciv_mp_cli_LDFLAGS = $(mp_cli_ldflags)
freeciv_mp_cli_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_cli_libs) -lsqlite3
endif
if MODINST_GTK3
freeciv_mp_gtk3_CPPFLAGS = $(common_cppflags) $(mp_gtk3_cflags)
freeciv_mp_gtk3_SOURCES = mpgui_gtk3.c
freeciv_mp_gtk3_LDFLAGS = $(mp_gtk3_ldflags)
freeciv_mp_gtk3_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_gtk3_libs) -lsqlite3 \
$(MPICON)
endif
if MODINST_GTK3X
freeciv_mp_gtk3x_CPPFLAGS = $(common_cppflags) $(mp_gtk3x_cflags)
freeciv_mp_gtk3x_SOURCES = mpgui_gtk4.c
freeciv_mp_gtk3x_LDFLAGS = $(mp_gtk3x_ldflags)
freeciv_mp_gtk3x_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_gtk3x_libs) -lsqlite3 \
$(MPICON)
endif
if MODINST_QT
MOC_FILES = \
meta_mpgui_qt.cpp \
meta_mpgui_qt_worker.cpp
freeciv_mp_qt_CPPFLAGS = $(common_cppflags) $(mp_qt_cppflags)
freeciv_mp_qt_CXXFLAGS = $(mp_qt_cxxflags)
freeciv_mp_qt_SOURCES = \
mpgui_qt.cpp \
mpgui_qt.h \
mpgui_qt_worker.cpp \
mpgui_qt_worker.h
nodist_freeciv_mp_qt_SOURCES = $(MOC_FILES)
CLEANFILES = $(MOC_FILES)
freeciv_mp_qt_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_qt_libs) -lsqlite3 \
$(MPICON)
endif
tools/fcmp/Makefile.am
## Process this file with automake to produce Makefile.in
MOCCMD=@MOCCMD@
include $(top_srcdir)/bootstrap/Makerules.mk
bin_PROGRAMS =
if MODINST_CLI
bin_PROGRAMS += freeciv-mp-cli
endif
if MODINST_GTK3
bin_PROGRAMS += freeciv-mp-gtk3
endif
if MODINST_GTK3X
bin_PROGRAMS += freeciv-mp-gtk3x
endif
if MODINST_QT
bin_PROGRAMS += freeciv-mp-qt
endif
if MODINST
noinst_LTLIBRARIES = libfcmp.la
endif
common_cppflags = \
-I$(top_srcdir)/dependencies/cvercmp \
-I$(top_srcdir)/utility \
-I$(top_srcdir)/common \
-I$(top_srcdir)/common/networking \
-I$(top_srcdir)/server \
-I$(top_srcdir)/client \
-I$(top_srcdir)/client/include \
-I$(top_srcdir)/tools/ruleutil \
-I$(top_srcdir)/tools/shared \
-I$(top_srcdir)/dependencies/tinycthread
AM_CPPFLAGS = $(common_cppflags)
if MINGW
MPICON = $(top_builddir)/windows/mpicon.o
else
desktopfiledir = @DESKTOPDIR@
desktopfile_DATA =
appdatafiledir = @APPDATADIR@
appdatafile_DATA =
if MODINST_GTK3
desktopfile_DATA += \
freeciv-mp-gtk3.desktop
appdatafile_DATA += \
freeciv-mp-gtk3.appdata.xml
endif
if MODINST_QT
desktopfile_DATA += \
freeciv-mp-qt.desktop
appdatafile_DATA += \
freeciv-mp-qt.appdata.xml
endif
endif
libfcmp_la_SOURCES = \
download.c \
download.h \
modinst.c \
modinst.h \
mpcmdline.c \
mpcmdline.h \
mpdb.c \
mpdb.h
if MODINST_CLI
freeciv_mp_cli_CPPFLAGS = $(common_cppflags) $(mp_cli_cflags)
freeciv_mp_cli_SOURCES = mpcli.c
freeciv_mp_cli_LDFLAGS = $(mp_cli_ldflags)
freeciv_mp_cli_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_cli_libs) -lsqlite3
endif
if MODINST_GTK3
freeciv_mp_gtk3_CPPFLAGS = $(common_cppflags) $(mp_gtk3_cflags)
freeciv_mp_gtk3_SOURCES = mpgui_gtk3.c
freeciv_mp_gtk3_LDFLAGS = $(mp_gtk3_ldflags)
freeciv_mp_gtk3_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_gtk3_libs) -lsqlite3 \
$(MPICON)
endif
if MODINST_GTK3X
freeciv_mp_gtk3x_CPPFLAGS = $(common_cppflags) $(mp_gtk3x_cflags)
freeciv_mp_gtk3x_SOURCES = mpgui_gtk4.c
freeciv_mp_gtk3x_LDFLAGS = $(mp_gtk3x_ldflags)
freeciv_mp_gtk3x_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_gtk3x_libs) -lsqlite3 \
$(MPICON)
endif
if MODINST_QT
MOC_FILES = \
meta_mpgui_qt.cpp \
meta_mpgui_qt_worker.cpp
freeciv_mp_qt_CPPFLAGS = $(common_cppflags) $(mp_qt_cppflags)
freeciv_mp_qt_CXXFLAGS = $(mp_qt_cxxflags)
freeciv_mp_qt_SOURCES = \
mpgui_qt.cpp \
mpgui_qt.h \
mpgui_qt_worker.cpp \
mpgui_qt_worker.h
nodist_freeciv_mp_qt_SOURCES = $(MOC_FILES)
CLEANFILES = $(MOC_FILES)
freeciv_mp_qt_LDADD = \
libfcmp.la \
$(top_builddir)/dependencies/cvercmp/libcvercmp.la \
$(top_builddir)/common/libfreeciv.la \
$(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
$(mp_qt_libs) -lsqlite3 \
$(MPICON)
endif
translations/core/POTFILES.in
data/scenarios/tutorial.sav
translations/Strings.txt
tools/civmanual.c
tools/download.c
tools/modinst.c
tools/modinst.h
tools/mpcli.c
tools/mpcmdline.c
tools/mpdb.c
tools/mpgui_gtk3.c
tools/mpgui_gtk4.c
tools/mpgui_qt.cpp
tools/mpgui_qt_worker.cpp
tools/ruleup.c
tools/fcmp/download.c
tools/fcmp/modinst.c
tools/fcmp/modinst.h
tools/fcmp/mpcli.c
tools/fcmp/mpcmdline.c
tools/fcmp/mpdb.c
tools/fcmp/mpgui_gtk3.c
tools/fcmp/mpgui_gtk4.c
tools/fcmp/mpgui_qt.cpp
tools/fcmp/mpgui_qt_worker.cpp
server/actiontools.c
server/aiiface.c
server/auth.c
    (1-1/1)