Mercurial > libavformat.hg
changeset 694:50e07cfe1e4f libavformat
fix lib order and remove nonsense avcodec double linking
| author | michael |
|---|---|
| date | Fri, 11 Mar 2005 11:34:31 +0000 |
| parents | d7109f709265 |
| children | 645c4432947b |
| files | Makefile |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Mar 09 02:12:44 2005 +0000 +++ b/Makefile Fri Mar 11 11:34:31 2005 +0000 @@ -55,8 +55,6 @@ ifeq ($(CONFIG_AUDIO_BEOS),yes) PPOBJS+= beosaudio.o EXTRALIBS+=-lbe -lmedia -# this should be the default ! -EXTRALIBS+=-lavcodec -L../libavcodec endif ifeq ($(CONFIG_NETWORK),yes) @@ -78,11 +76,11 @@ LIB= $(LIBPREF)avformat$(LIBSUF) ifeq ($(BUILD_SHARED),yes) SLIB= $(SLIBPREF)avformat$(SLIBSUF) + +AVCLIBS+=-lavcodec -L../libavcodec +ifeq ($(CONFIG_MP3LAME),yes) +AVCLIBS+=-lmp3lame endif - -EXTRALIBS+=-lavcodec -L../libavcodec -ifeq ($(CONFIG_MP3LAME),yes) -EXTRALIBS+=-lmp3lame endif SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) @@ -96,10 +94,10 @@ $(SLIB): $(OBJS) ifeq ($(CONFIG_WIN32),yes) - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll + $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll -lib /machine:i386 /def:$(@:.dll=.def) else - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) endif depend: $(SRCS)