From 1e42f9a4691b074eac5b47536f9f828809fe16ca Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 30 Jan 2017 15:56:42 +0300 Subject: Add configure flag for prevent bulding main game code. New configure flag:--with-manaplusgame / --without-manaplusgame By default it allow build main game code. --- configure.ac | 9 +++++++++ src/Makefile.am | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 59ff88913..080bdf791 100755 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,15 @@ fi AM_CONDITIONAL(ENABLE_DYECMD, test x$with_dyecmd = xyes) +# Option to enable ManaPlus game +AC_ARG_WITH(manaplusgame,[ --without-manaplusgame don't build ManaPlus game ] ) +if test "x$with_manaplusgame" == "xno"; then + with_manaplusgame=no +else + with_manaplusgame=yes +fi +AM_CONDITIONAL(ENABLE_MANAPLUSGAME, test x$with_manaplusgame = xyes) + # Enable nacl build AC_ARG_ENABLE(naclbuild, [ --enable-naclbuild Turn on nacl building], diff --git a/src/Makefile.am b/src/Makefile.am index 82520dc34..377730fcf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,18 @@ AUTOMAKE_OPTIONS = subdir-objects +if ENABLE_MANAPLUSGAME if ENABLE_DYECMD bin_PROGRAMS = manaplus dyecmd else bin_PROGRAMS = manaplus endif +else +if ENABLE_DYECMD +bin_PROGRAMS = dyecmd +else +bin_PROGRAMS = +endif +endif dyecmd_CXXFLAGS = -DPKG_DATADIR=\""$(pkgdatadir)/"\" \ -DLOCALEDIR=\""$(localedir)"\" \ @@ -810,8 +818,9 @@ SRC += utils/xml/libxml.cpp \ endif dyecmd_SOURCES += ${SRC} -manaplus_SOURCES += ${SRC} +if ENABLE_MANAPLUSGAME +manaplus_SOURCES += ${SRC} manaplus_SOURCES += main.cpp \ main.h \ avatar.cpp \ @@ -1844,6 +1853,7 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ manaplus_SOURCES += \ mumblemanager.cpp \ mumblemanager.h +endif dyecmd_SOURCES += dyetool/gui/viewport.cpp \ dyetool/gui/viewport.h \ -- cgit v1.2.3-70-g09d2