From 1f8f50efbe0d11765b48de0befc38fb7a554a307 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 15 Mar 2005 12:37:39 +0000 Subject: [PATCH] dont link with libavcodec twice on win32 Originally committed as revision 4039 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 42245427b31..6ff36d1a5bc 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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) -- 2.39.2