Skip to content
Snippets Groups Projects
Commit 1f8f50ef authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

dont link with libavcodec twice on win32 

Originally committed as revision 4039 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7c7f3866
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
libavformat/Makefile
+ 1
− 1
View file @ 1f8f50ef
...@@ -94,7 +94,7 @@ $(LIB): $(OBJS) $(PPOBJS) ...@@ -94,7 +94,7 @@ $(LIB): $(OBJS) $(PPOBJS)
$(SLIB): $(OBJS) $(SLIB): $(OBJS)
ifeq ($(CONFIG_WIN32),yes) 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) -lib /machine:i386 /def:$(@:.dll=.def)
else else
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment