diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-15 00:11:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-15 00:11:32 +0300 |
| commit | 913705174357a514e6ffa62ec32df75dbbce5cf5 (patch) | |
| tree | a3314b808d995898df76085f0c3f0ebce5f89feb | |
| parent | 015515ba20b66195840afd1c0c074f0729995a2d (diff) | |
| download | mv-913705174357a514e6ffa62ec32df75dbbce5cf5.tar.gz mv-913705174357a514e6ffa62ec32df75dbbce5cf5.tar.bz2 mv-913705174357a514e6ffa62ec32df75dbbce5cf5.tar.xz mv-913705174357a514e6ffa62ec32df75dbbce5cf5.zip | |
Complete support for USE_MUMBLE flag.
| -rwxr-xr-x | configure.ac | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/setup_audio.cpp | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 45d285a59..256f17507 100755 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,15 @@ else fi AM_CONDITIONAL(USE_INTERNALGUICHAN, test x$with_internalguichan = xyes) +# Option to enable mumble support +AC_ARG_WITH(internalguichan,[ --without-mumble don't use mumble integration ] ) +if test "x$with_mumble" == "xno"; then + with_mumble=no +else + with_mumble=yes +fi +AM_CONDITIONAL(USE_MUMBLE, test x$with_mumble = xyes) + AC_CHECK_LIB(SDL_net, SDLNet_Init, , AC_MSG_ERROR([ *** Unable to find SDL_net library])) diff --git a/src/Makefile.am b/src/Makefile.am index fba5e2cb7..45df21458 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,6 +21,10 @@ else manaplus_SOURCES = endif +if USE_MUMBLE +manaplus_CXXFLAGS += -DUSE_MUMBLE +endif + if USE_INTERNALGUICHAN manaplus_CXXFLAGS += -DUSE_INTERNALGUICHAN manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index ccd304c84..447b4633c 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -22,6 +22,8 @@ #include "gui/setup_audio.h" +#include "main.h" + #include "configuration.h" #include "sound.h" @@ -126,8 +128,10 @@ Setup_Audio::Setup_Audio() : new SetupItemLabel(_("Other"), "", this); +#ifdef USE_MUMBLE new SetupItemCheckBox(_("Enable mumble voice chat"), "", "enableMumble", this, "enableMumbleEvent"); +#endif new SetupItemCheckBox(_("Download music"), "", "download-music", this, "download-musicEvent"); |