diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-03-28 15:49:48 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-03-28 15:49:48 +0000 |
| commit | b461f076273b3bf78c5f889515cc7541e9d3b701 (patch) | |
| tree | 1eb57d0d03bc90a07b246e417b0b099cc78ca4ca /pjmedia/build/Makefile | |
| parent | 047dad8b9f0e7ef5c92ce4e750bcfbb20d4c4796 (diff) | |
Updated projects and Makefiles with the new pjnath library
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1111 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build/Makefile')
| -rw-r--r-- | pjmedia/build/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 281c2c20..ff04ab9c 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -20,6 +20,7 @@ RULES_MAK := ../../build/rules.mak PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) +PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) export PJMEDIA_LIB:=../lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) @@ -49,8 +50,10 @@ NULLSOUND_OBJS := nullsound.o # Gather all flags. # export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ - $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include \ + $(CFLAGS) $(CC_INC)../include \ + $(CC_INC)../../pjlib/include \ $(CC_INC)../../pjlib-util/include \ + $(CC_INC)../../pjnath/include \ $(CC_INC)../src/pjmedia/portaudio \ $(CC_INC)../src/pjmedia-codec export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ @@ -58,6 +61,7 @@ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ + $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ $(LDFLAGS) @@ -74,7 +78,7 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ port.o splitcomb.o resample.o \ resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \ session.o silencedet.o sound_port.o stream.o \ - tonegen.o transport_udp.o \ + tonegen.o transport_ice.o transport_udp.o \ wav_player.o wav_playlist.o wav_writer.o wave.o \ $(SOUND_OBJS) $(NULLSOUND_OBJS) |