Mercurial > libavformat.hg

diff Makefile @ 702:23f12cd0dc53 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dont link with libavcodec twice on win32
author michael
date Tue, 15 Mar 2005 12:37:39 +0000
parents 50e07cfe1e4f
children cc612862d461
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)