diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-30 00:22:41 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-30 00:22:41 +0000 |
| commit | 320d060ae94eea9018ee4292cd18b506c333d377 (patch) | |
| tree | cc5f4cb5a457f7781b3b3a30038ebeea6dbb173c /libavformat | |
| parent | 53862e0fa6be8a0a0d750f9e8897934068dbe6d0 (diff) | |
| download | ffmpeg-320d060ae94eea9018ee4292cd18b506c333d377.tar.gz | |
On MinGW it is not possible to build shared and static libraries at once.
Add means to disable building the static libraries and fix a few issues
with the MinGW build.
All the hard work done by Alexander Strasser, minor changes by myself.
Originally committed as revision 4909 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 92a1e686e8..55abd2be2b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -10,7 +10,7 @@ CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/liba #FIXME: This should be in configure/config.mak ifeq ($(CONFIG_WIN32),yes) - LDFLAGS=-Wl,--output-def,$(@:.dll=.def) + LDFLAGS=-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a) endif OBJS= utils.o cutils.o os_support.o allformats.o @@ -157,7 +157,8 @@ install-headers: g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< clean: - rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll + rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \ + *.lib *.def *.dll.a *.exp distclean: clean rm -f .depend |