Preliminary autotools support for libana.
This should be enough to compile Wesnoth using libana (use --enable-ana), but certainly not enough to compile libana as a stand-alone library using autotools. I'll probably research that later.
This commit is contained in:
Ignacio R. Morelle
parent
798245e3c1
commit
d9a9a85529
2 changed files with 50 additions and 7 deletions
11
configure.ac
11
configure.ac
|
|
@ -261,6 +261,11 @@ AC_ARG_WITH([fribidi],
|
|||
[fribidi=$withval],
|
||||
[fribidi=yes])
|
||||
|
||||
AC_ARG_ENABLE([ana],
|
||||
AS_HELP_STRING([--enable-ana], [use the experimental ANA networking framework (work-in-progress)]),
|
||||
[ana=$enableval],
|
||||
[ana=no])
|
||||
|
||||
AC_ARG_ENABLE([pool-alloc],
|
||||
AS_HELP_STRING([--enable-pool-alloc], [enable the pool allocator]),
|
||||
[poolalloc=$enableval],
|
||||
|
|
@ -331,6 +336,7 @@ AM_CONDITIONAL([GCC], [test x$GXX = xyes])
|
|||
AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
|
||||
AM_CONDITIONAL([INSTALLDATA], [test [ x$game = xyes || test x$editor = xyes ]])
|
||||
AM_CONDITIONAL([POOLALLOC], [test x$poolalloc = xyes])
|
||||
AM_CONDITIONAL([ANA], [test x$ana = xyes])
|
||||
|
||||
if test x$editor = xno
|
||||
then
|
||||
|
|
@ -891,6 +897,11 @@ BOOST_REQUIRE([1.35])
|
|||
BOOST_IOSTREAMS
|
||||
BOOST_REGEX
|
||||
|
||||
if test "x$ana" = "xyes"; then
|
||||
BOOST_ASIO
|
||||
BOOST_THREADS
|
||||
fi
|
||||
|
||||
if test "x$tests" = "xyes"; then
|
||||
BOOST_TEST
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ CLEANFILES += $(bin_SCRIPTS)
|
|||
endif
|
||||
|
||||
noinst_LIBRARIES = libwesnoth-core.a libwesnoth.a
|
||||
if ANA
|
||||
noinst_LIBRARIES += libana.a
|
||||
endif
|
||||
|
||||
pkgdatadir=$(datadir)/@DATADIR@
|
||||
|
||||
|
|
@ -37,6 +40,14 @@ THELIBS = -L. $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
|
|||
$(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBINTL) \
|
||||
$(BOOST_IOSTREAMS_LIBS) $(BOOST_REGEX_LIBS)
|
||||
|
||||
if ANA
|
||||
network_core = network_ana.cpp
|
||||
else
|
||||
network_core = \
|
||||
network.cpp \
|
||||
network_worker.cpp
|
||||
endif
|
||||
|
||||
wesnoth_source = \
|
||||
about.cpp \
|
||||
actions.cpp \
|
||||
|
|
@ -227,8 +238,7 @@ wesnoth_source = \
|
|||
multiplayer_wait.cpp \
|
||||
multiplayer_connect.cpp \
|
||||
multiplayer_create.cpp \
|
||||
network.cpp \
|
||||
network_worker.cpp \
|
||||
$(network_core) \
|
||||
pathfind/pathfind.cpp \
|
||||
persist_context.cpp \
|
||||
persist_var.cpp \
|
||||
|
|
@ -326,6 +336,10 @@ wesnoth_SOURCES = \
|
|||
|
||||
wesnoth_LDADD = $(INTERNALLIBS) $(THELIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS)
|
||||
wesnoth_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
|
||||
if ANA
|
||||
wesnoth_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
|
||||
wesnoth_DEPENDENCIES += libana.a
|
||||
endif
|
||||
|
||||
|
||||
#############################################################################
|
||||
|
|
@ -347,13 +361,16 @@ wesnothd_SOURCES = \
|
|||
server/user_handler.cpp \
|
||||
server/forum_user_handler.cpp \
|
||||
server/sample_user_handler.cpp \
|
||||
network.cpp \
|
||||
network_worker.cpp \
|
||||
$(network_core) \
|
||||
loadscreen_empty.cpp
|
||||
|
||||
|
||||
wesnothd_LDADD = -L. -lwesnoth-core $(BOOST_IOSTREAMS_LIBS) @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBINTL)
|
||||
wesnothd_DEPENDENCIES=libwesnoth-core.a
|
||||
if ANA
|
||||
wesnothd_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
|
||||
wesnothd_DEPENDENCIES += libana.a
|
||||
endif
|
||||
|
||||
#############################################################################
|
||||
# Campaign Server #
|
||||
|
|
@ -363,12 +380,15 @@ campaignd_SOURCES = \
|
|||
addon/validation.cpp \
|
||||
campaign_server/campaign_server.cpp \
|
||||
server/input_stream.cpp \
|
||||
network.cpp \
|
||||
network_worker.cpp \
|
||||
$(network_core) \
|
||||
loadscreen_empty.cpp
|
||||
|
||||
campaignd_LDADD = -L. -lwesnoth-core $(BOOST_IOSTREAMS_LIBS) @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBINTL)
|
||||
campaignd_DEPENDENCIES=libwesnoth-core.a
|
||||
if ANA
|
||||
campaignd_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
|
||||
campaignd_DEPENDENCIES += libana.a
|
||||
endif
|
||||
|
||||
#############################################################################
|
||||
# Castle building helpers #
|
||||
|
|
@ -409,7 +429,7 @@ test_SOURCES = \
|
|||
tests/test_config_cache.cpp \
|
||||
tests/test_formula_ai.cpp \
|
||||
tests/test_lexical_cast.cpp \
|
||||
tests/test_network_worker.cpp \
|
||||
tests/test_network_worker.cpp \
|
||||
tests/test_policy.cpp \
|
||||
tests/test_team.cpp \
|
||||
tests/test_util.cpp \
|
||||
|
|
@ -514,6 +534,15 @@ libwesnoth_a_SOURCES = \
|
|||
widgets/widget.cpp \
|
||||
wml_exception.cpp
|
||||
|
||||
if ANA
|
||||
libana_a_SOURCES = \
|
||||
ana/src/asio_client.cpp \
|
||||
ana/src/asio_listener.cpp \
|
||||
ana/src/asio_proxy_connection.cpp \
|
||||
ana/src/asio_server.cpp
|
||||
CXXFLAGS += -Iana/api
|
||||
endif
|
||||
|
||||
# Until game_config.cpp is removed, this will be needed to ensure that the
|
||||
# REVISION constant gets updated correctly. If and when that definition is
|
||||
# moved elsewhere, this dependency must follow it.
|
||||
|
|
@ -576,6 +605,9 @@ LDFLAGS += -all-static
|
|||
endif
|
||||
|
||||
LDFLAGS += $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_REGEX_LDFLAGS)
|
||||
if ANA
|
||||
LDFLAGS += $(BOOST_SYSTEM_LDFLAGS)
|
||||
endif
|
||||
|
||||
|
||||
#if STATIC
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue