Mercurial > libavformat.hg
changeset 702:23f12cd0dc53 libavformat
dont link with libavcodec twice on win32
| author | michael |
|---|---|
| date | Tue, 15 Mar 2005 12:37:39 +0000 |
| parents | 72dd5e4fd538 |
| children | 81107e92a7a5 |
| files | Makefile |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)