mirror of https://git.ffmpeg.org/ffmpeg.git
Move the EXTRALIBS to the end of the link line where they actually get used!
Originally committed as revision 452 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a69b930cd3
commit
c6a8f2ce07
4
Makefile
4
Makefile
|
@ -39,10 +39,10 @@ lib:
|
||||||
$(MAKE) -C libav all
|
$(MAKE) -C libav all
|
||||||
|
|
||||||
ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
|
ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
|
||||||
$(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
|
$(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
|
||||||
|
|
||||||
ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
|
ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
|
||||||
$(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
|
$(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
|
||||||
|
|
||||||
ffplay: ffmpeg$(EXE)
|
ffplay: ffmpeg$(EXE)
|
||||||
ln -sf $< $@
|
ln -sf $< $@
|
||||||
|
|
Loading…
Reference in New Issue