Revision 39ca126e

View differences:

Makefile
86 86
#.PHONY: Streamers/streamer-grapes Streamers/streamer-ml-monl-grapes$(XSTATIC)$(EXE) Streamers/streamer-chunkstream$(EXE) Streamers/streamer-ml-monl-chunkstream$(XSTATIC)$(EXE)
87 87
Streamers/streamer-udp-grapes$(EXE): $(THIRDPARTYLIBS)
88 88
	cd Streamers && ./configure \
89
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags`" --with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs`" \
89
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags` -L $(THIRDPARTYLIBS)/pjproject/lib" \
90
 	--with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs` -lpjproject " \
90 91
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg \
91 92
	--with-net-helper=udp \
92
	--with-static=$(STATIC)
93
	--with-static=$(STATIC) 
93 94
	$(MAKE) -C Streamers
94 95

  
95 96
#version with NAPA-libs
96 97
Streamers/streamer-ml-monl-grapes$(XSTATIC)$(EXE): $(THIRDPARTYLIBS)
97 98
	cd Streamers && ./configure \
98
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags`" --with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs`" \
99
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags` -L $(THIRDPARTYLIBS)/pjproject/lib" \
100
 	--with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs` -lpjproject " \
99 101
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg \
100 102
	--with-napa=$(THIRDPARTYLIBS)/NAPA-BASELIBS/ --with-libevent=$(THIRDPARTYLIBS)/NAPA-BASELIBS/3RDPARTY-LIBS/libevent \
101 103
	--with-net-helper=ml --with-monl \
......
104 106

  
105 107
Streamers/streamer-udp-chunkstream$(EXE): $(THIRDPARTYLIBS)
106 108
	cd Streamers && ./configure \
109
	--with-ldflags=" -L $(THIRDPARTYLIBS)/pjproject/lib" \
110
 	--with-ldlibs=" -lpjproject " \
107 111
	--with-io=chunkstream \
108 112
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg \
109 113
	--with-net-helper=udp \
......
112 116

  
113 117
Streamers/streamer-ml-monl-chunkstream$(XSTATIC)$(EXE): $(THIRDPARTYLIBS)
114 118
	cd Streamers && ./configure \
119
	--with-ldflags=" -L $(THIRDPARTYLIBS)/pjproject/lib" \
120
 	--with-ldlibs=" -lpjproject " \
115 121
	--with-io=chunkstream \
116 122
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg \
117 123
	--with-napa=$(THIRDPARTYLIBS)/NAPA-BASELIBS/ --with-libevent=$(THIRDPARTYLIBS)/NAPA-BASELIBS/3RDPARTY-LIBS/libevent \
THIRDPARTY-LIBS/GRAPES
1
Subproject commit a1fdac31771c445a6022e29e7f73617901fe9ab9
1
Subproject commit 9f6ee5c0a4f16fde57a81f8c6bdc894d8c627b98
THIRDPARTY-LIBS/Makefile
127 127

  
128 128
pjproject-src:
129 129
	$(WGET_OR_CURL) http://www.pjsip.org/release/2.1/pjproject-2.1.tar.bz2
130
	tar -C pjproject-src xjf pjproject-2.1.tar.bz2
130
	[ ! -d pjproject-src ] || mkdir pjproject-src
131
	tar xjf pjproject-2.1.tar.bz2 
132
	mv pjproject-2.1.0  pjproject-src
131 133

  
132 134
pjproject: pjproject-src
133
	cd pjproject-src
134
	./configure --disable-sound --disable-oss --disable-video --disable-small-filter --disable-large-filter --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l2 --disable-ssl --disable-opencore-amr --disable-silk --prefix=$(THIRDPARTYLIBS)/pjproject"
135
	make dep
136
	make
137
	make install
138

  
139
GRAPES-build: ffmpeg-install pjproject
135
	cd pjproject-src && ./configure --disable-sound --disable-oss --disable-video --disable-small-filter --disable-large-filter --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l2 --disable-ssl --disable-opencore-amr --disable-silk --prefix=$(THIRDPARTYLIBS)/pjproject 
136
	$(MAKE) -C pjproject-src dep
137
	$(MAKE) -C pjproject-src
138
	$(MAKE) -C pjproject-src install
139
	cd pjproject/lib && \
140
	for f in `ls *.a`; do\
141
		ar -x $$f;\
142
	done && \
143
	ar rcs libpjproject.a *.o
144

  
145
GRAPES-build: ffmpeg-install pjproject 
140 146
	$(FLAGS_GRAPES) FFDIR=$(THIRDPARTYLIBS)/ffmpeg $(MAKE) PJDIR=$(THIRDPARTYLIBS)/pjproject -C GRAPES || { echo "Error compiling GRAPES" && exit 1; }
141 147

  
142 148
NAPA-build:

Also available in: Unified diff