dont link with libavcodec twice on win32
Originally committed as revision 4039 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7c7f386677
commit
1f8f50efbe
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user