]> git.sesse.net Git - ffmpeg/commitdiff
dont link with libavcodec twice on win32
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Mar 2005 12:37:39 +0000 (12:37 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Mar 2005 12:37:39 +0000 (12:37 +0000)
Originally committed as revision 4039 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/Makefile

index 42245427b31f8f19ce45ddef8be28dab946a7e03..6ff36d1a5bc94821a96cfe630091eff21edf9a9f 100644 (file)
@@ -94,7 +94,7 @@ $(LIB): $(OBJS) $(PPOBJS)
 
 $(SLIB): $(OBJS)
 ifeq ($(CONFIG_WIN32),yes)
-       $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
+       $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
        -lib /machine:i386 /def:$(@:.dll=.def)
 else
        $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)