Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

fix lib order and remove nonsense avcodec double linking

Browse source 
Originally committed as revision 4029 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-03-11 11:34:31 +00:00
parent 4e4d983e8b
commit efd9e75cb0
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libavformat/Makefile
View file

@ -55,8 +55,6 @@ endif
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 @@ endif
LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
endif
EXTRALIBS+=-lavcodec -L../libavcodec
AVCLIBS+=-lavcodec -L../libavcodec
ifeq ($(CONFIG_MP3LAME),yes)
EXTRALIBS+=-lmp3lame
AVCLIBS+=-lmp3lame
endif
endif
SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
@ -96,10 +94,10 @@ $(LIB): $(OBJS) $(PPOBJS)
$(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)