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 /libavcodec | |
| 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 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b12dff0327..794d3c826a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -11,7 +11,7 @@ CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSE #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= bitstream.o utils.o mem.o allcodecs.o \ @@ -449,6 +449,7 @@ dep: depend clean: $(CLEANAMR) rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \ + *.dll.a *.def *.exp \ i386/*.o i386/*~ \ armv4l/*.o armv4l/*~ \ mlib/*.o mlib/*~ \ |