Skip to content
Snippets Groups Projects
Commit 59e26a8c authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #34663: daemon: make it easier to swap pjsip implementations

parent 9d8f134c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 8 additions and 7 deletions
daemon/globals.mak
+ 8
− 7
View file @ 59e26a8c
...@@ -7,16 +7,17 @@ sflplugindir=$(sfllibdir)/plugins ...@@ -7,16 +7,17 @@ sflplugindir=$(sfllibdir)/plugins
ASTYLERC="$(top_srcdir)/../astylerc" ASTYLERC="$(top_srcdir)/../astylerc"
indent="/usr/bin/astyle" indent="/usr/bin/astyle"
PJPROJECT_DIR=pjproject-2.1.0
# for pjsip # for pjsip
include $(src)/libs/pjproject-2.1.0/build.mak include $(src)/libs/$(PJPROJECT_DIR)/build.mak
PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS) PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS)
SIP_CFLAGS=-I$(src)/libs/pjproject-2.1.0/pjsip/include \ SIP_CFLAGS=-I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
-I$(src)/libs/pjproject-2.1.0/pjlib/include \ -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
-I$(src)/libs/pjproject-2.1.0/pjlib-util/include \ -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
-I$(src)/libs/pjproject-2.1.0/pjmedia/include \ -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
-I$(src)/libs/pjproject-2.1.0/pjnath/include \ -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
-DPJ_AUTOCONF=1 -DPJ_AUTOCONF=1
if BUILD_SPEEX if BUILD_SPEEX
...@@ -41,7 +42,7 @@ endif ...@@ -41,7 +42,7 @@ endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(src)/libs \ -I$(src)/libs \
-I$(src)/libs/iax2 \ -I$(src)/libs/iax2 \
-I$(src)/libs/pjproject-2.1.0 \ -I$(src)/libs/$(PJPROJECT_DIR) \
-I$(src)/src \ -I$(src)/src \
-I$(src)/src/config \ -I$(src)/src/config \
-I$(src)/test \ -I$(src)/test \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment