moved zrtp cppflags to Makefile.defs

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@951 8eb893ce-cfd4-0310-b710-fb5ebe64c474
19 years ago · 9187598d3c
parent 6f44a030bb
commit 9187598d3c
2 changed files with 8 additions and 5 deletions
--- a/Makefile.defs
+++ b/Makefile.defs
@ -36,7 +36,7 @@ CPPFLAGS += -D_DEBUG \

 #
 # ZRTP support? (see zfoneproject.com)
-#WITH_ZRTP = yes
+WITH_ZRTP = yes

 #
 # exclude some modules from compilation?
@ -91,6 +91,13 @@ ifeq ($(DEBUG_PLAYOUT), yes)
 CPPFLAGS +=  -DDEBUG_PLAYOUTBUF
 endif

+ifdef WITH_ZRTP
+CPPFLAGS += -DWITH_ZRTP \
+	    -DBUILD_ZRTP_MUTEXES \
+	    -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES \
+	    -I/usr/local/include/zrtp 
+endif
+
 TARGET =
 LIB_LDFLAGS = -shared

--- a/core/Makefile
+++ b/core/Makefile
@ -66,10 +66,6 @@ LDFLAGS +=-lsamplerate
 endif

 ifdef WITH_ZRTP
-CPPFLAGS += -DWITH_ZRTP \
-	    -DBUILD_ZRTP_MUTEXES \
-	    -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES \
-	    -I/usr/local/include/zrtp 
 LDFLAGS +=-lzrtp -lbn
 endif