# HG changeset patch # User michael # Date 1110890259 0 # Node ID 23f12cd0dc5325b1227e98e3dfde79b5d320af1c # Parent 72dd5e4fd538c650f4de93fbf4459db0a6e4a1fa dont link with libavcodec twice on win32 diff -r 72dd5e4fd538 -r 23f12cd0dc53 Makefile --- a/Makefile Tue Mar 15 03:42:57 2005 +0000 +++ b/Makefile Tue Mar 15 12:37:39 2005 +0000 @@ -94,7 +94,7 @@ $(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)