Revision 3eb0db69 Makefile

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` -L $(THIRDPARTYLIBS)/pjproject/lib" \
90
 	--with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs` -lpjproject " \
89
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags` -L$(THIRDPARTYLIBS)/pjproject/lib" \
90
 	--with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs` `cat $(THIRDPARTYLIBS)/pjproject.ldlibs` -lpjproject " \
91 91
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg \
92 92
	--with-net-helper=udp \
93 93
	--with-static=$(STATIC) 
......
96 96
#version with NAPA-libs
97 97
Streamers/streamer-ml-monl-grapes$(XSTATIC)$(EXE): $(THIRDPARTYLIBS)
98 98
	cd Streamers && ./configure \
99
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags` -L $(THIRDPARTYLIBS)/pjproject/lib" \
100
 	--with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs` -lpjproject " \
99
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags` -L$(THIRDPARTYLIBS)/pjproject/lib" \
100
 	--with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs` `cat $(THIRDPARTYLIBS)/pjproject.ldlibs` -lpjproject " \
101 101
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg \
102 102
	--with-napa=$(THIRDPARTYLIBS)/NAPA-BASELIBS/ --with-libevent=$(THIRDPARTYLIBS)/NAPA-BASELIBS/3RDPARTY-LIBS/libevent \
103 103
	--with-net-helper=ml --with-monl \
......
106 106

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

  
117 117
Streamers/streamer-ml-monl-chunkstream$(XSTATIC)$(EXE): $(THIRDPARTYLIBS)
118 118
	cd Streamers && ./configure \
119
	--with-ldflags=" -L $(THIRDPARTYLIBS)/pjproject/lib" \
120
 	--with-ldlibs=" -lpjproject " \
119
	--with-ldflags=" -L$(THIRDPARTYLIBS)/pjproject/lib" \
120
 	--with-ldlibs="`cat $(THIRDPARTYLIBS)/pjproject.ldlibs` -lpjproject " \
121 121
	--with-io=chunkstream \
122 122
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg \
123 123
	--with-napa=$(THIRDPARTYLIBS)/NAPA-BASELIBS/ --with-libevent=$(THIRDPARTYLIBS)/NAPA-BASELIBS/3RDPARTY-LIBS/libevent \

Also available in: Unified diff