More fixes to compile and build on more platforms.
Originally committed as revision 1280 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
4
Makefile
4
Makefile
@@ -69,7 +69,7 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
|
||||
ffserver$(EXE): ffserver.o $(DEP_LIBS)
|
||||
$(CC) $(LDFLAGS) $(FFSLDFLAGS) \
|
||||
-o $@ ffserver.o -L./libavcodec -L./libavformat \
|
||||
-lavformat -lavcodec -ldl $(EXTRALIBS)
|
||||
-lavformat -lavcodec $(EXTRALIBS)
|
||||
|
||||
ffplay: ffmpeg$(EXE)
|
||||
ln -sf $< $@
|
||||
@@ -120,7 +120,7 @@ TAGS:
|
||||
# regression tests
|
||||
|
||||
libavtest test mpeg4 mpeg: ffmpeg$(EXE)
|
||||
make -C tests $@
|
||||
$(MAKE) -C tests $@
|
||||
|
||||
ifneq ($(wildcard .depend),)
|
||||
include .depend
|
||||
|
||||
Reference in New Issue
Block a user