summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubos Dolezel <lubos@dolezel.info>2015-06-03 14:30:46 +0200
committerLubos Dolezel <lubos@dolezel.info>2015-06-03 14:30:46 +0200
commit6d6ac1985afeb11a5e194e86a9ad330d48aa2059 (patch)
treefb056ebd3a2cde3febbd0ceaaf53d11cd90d442f
parent1b3018cc7b4f4503293114ce46683890d5da3867 (diff)
downloadtwinkle-6d6ac1985afeb11a5e194e86a9ad330d48aa2059.tar
twinkle-6d6ac1985afeb11a5e194e86a9ad330d48aa2059.tar.gz
twinkle-6d6ac1985afeb11a5e194e86a9ad330d48aa2059.tar.lz
twinkle-6d6ac1985afeb11a5e194e86a9ad330d48aa2059.tar.xz
twinkle-6d6ac1985afeb11a5e194e86a9ad330d48aa2059.zip
Document WITH_ALSA; allow user to enable Diamondcard integration
-rw-r--r--CMakeLists.txt8
-rw-r--r--twinkle_config.h.in1
2 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a66b76..a538bda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,11 @@ set(PRODUCT_VERSION "1.9.0")
set(PRODUCT_DATE "June 1, 2015")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-OPTION(WITH_ZRTP "Enable ZRTP encrypted calls" OFF)
-OPTION(WITH_SPEEX "Enable the Speex codec" OFF)
-OPTION(WITH_ILBC "Enable the iLBC codec" OFF)
+OPTION(WITH_ZRTP "Enable ZRTP encrypted calls" OFF)
+OPTION(WITH_SPEEX "Enable the Speex codec" OFF)
+OPTION(WITH_ILBC "Enable the iLBC codec" OFF)
+OPTION(WITH_ALSA "Enable ALSA support" ON)
+OPTION(WITH_DIAMONDCARD "Enable Diamondcard integration" OFF)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
diff --git a/twinkle_config.h.in b/twinkle_config.h.in
index 409fe74..880d704 100644
--- a/twinkle_config.h.in
+++ b/twinkle_config.h.in
@@ -1,3 +1,4 @@
+#cmakedefine WITH_DIAMONDCARD
#cmakedefine HAVE_SPEEX
#cmakedefine HAVE_ILBC
#cmakedefine HAVE_ZRTP