Commit 4268ed97 authored by michael's avatar michael

dont link with libavcodec twice on win32


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4039 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b6c8369a
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment