Author: sayer
Date: 2008-05-14 14:59:29 +0200 (Wed, 14 May 2008)
New Revision: 951

Modified:
   trunk/Makefile.defs
   trunk/core/Makefile
Log:
moved zrtp cppflags to Makefile.defs

Modified: trunk/Makefile.defs
===================================================================
--- trunk/Makefile.defs 2008-05-14 12:54:45 UTC (rev 950)
+++ trunk/Makefile.defs 2008-05-14 12:59:29 UTC (rev 951)
@@ -36,7 +36,7 @@
 
 #
 # ZRTP support? (see zfoneproject.com)
-#WITH_ZRTP = yes
+WITH_ZRTP = yes
 
 #
 # exclude some modules from compilation?
@@ -91,6 +91,13 @@
 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
 

Modified: trunk/core/Makefile
===================================================================
--- trunk/core/Makefile 2008-05-14 12:54:45 UTC (rev 950)
+++ trunk/core/Makefile 2008-05-14 12:59:29 UTC (rev 951)
@@ -66,10 +66,6 @@
 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
 

_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to