Mercurial > libavformat.hg
comparison Makefile @ 702:23f12cd0dc53 libavformat
dont link with libavcodec twice on win32
author | michael |
---|---|
date | Tue, 15 Mar 2005 12:37:39 +0000 |
parents | 50e07cfe1e4f |
children | cc612862d461 |
comparison
equal
deleted
inserted
replaced
701:72dd5e4fd538 | 702:23f12cd0dc53 |
---|---|
92 $(AR) rc $@ $(OBJS) $(PPOBJS) | 92 $(AR) rc $@ $(OBJS) $(PPOBJS) |
93 $(RANLIB) $@ | 93 $(RANLIB) $@ |
94 | 94 |
95 $(SLIB): $(OBJS) | 95 $(SLIB): $(OBJS) |
96 ifeq ($(CONFIG_WIN32),yes) | 96 ifeq ($(CONFIG_WIN32),yes) |
97 $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll | 97 $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) |
98 -lib /machine:i386 /def:$(@:.dll=.def) | 98 -lib /machine:i386 /def:$(@:.dll=.def) |
99 else | 99 else |
100 $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) | 100 $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) |
101 endif | 101 endif |
102 | 102 |