diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-03-15 12:37:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-03-15 12:37:39 +0000 |
| commit | 1f8f50efbe0d11765b48de0befc38fb7a554a307 (patch) | |
| tree | ae7dee37dffb1d0bb7d0e708d99e32e22e6b0bfb /libavformat | |
| parent | 7c7f3866775490f3869a6c7beeaf48636c05c16b (diff) | |
| download | ffmpeg-1f8f50efbe0d11765b48de0befc38fb7a554a307.tar.gz | |
dont link with libavcodec twice on win32
Originally committed as revision 4039 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 42245427b3..6ff36d1a5b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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) |