summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/setup_audio.cpp4
2 files changed, 8 insertions, 0 deletions
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");