aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-01-30 00:22:41 +0000
committerDiego Biurrun <diego@biurrun.de>2006-01-30 00:22:41 +0000
commit320d060ae94eea9018ee4292cd18b506c333d377 (patch)
treecc5f4cb5a457f7781b3b3a30038ebeea6dbb173c /libavutil/Makefile
parent53862e0fa6be8a0a0d750f9e8897934068dbe6d0 (diff)
downloadffmpeg-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 'libavutil/Makefile')
-rw-r--r--libavutil/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 9d02aab4ef..4dcb7e3b19 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -6,11 +6,11 @@ include ../config.mak
VPATH=$(SRC_PATH)/libavutil
# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
#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= mathematics.o \
@@ -53,7 +53,8 @@ depend: $(SRCS)
dep: depend
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