diff options
author | Fabrice Bellard <fabrice@bellard.org> | 2001-09-16 21:54:00 +0000 |
---|---|---|
committer | Fabrice Bellard <fabrice@bellard.org> | 2001-09-16 21:54:00 +0000 |
commit | c34270f5e89fd95b933c483d602f2f298557d04b (patch) | |
tree | f9853abd51f2b0aabe28048b0e213d20580a6b39 /libavcodec/Makefile | |
parent | 8d67072fea31e3b97e0a527e2a94e418745ba02a (diff) | |
download | ffmpeg-c34270f5e89fd95b933c483d602f2f298557d04b.tar.gz |
mlib merge
Originally committed as revision 131 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fe0e1d028d..03d75541c7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -29,6 +29,13 @@ ASM_OBJS += armv4l/jrevdct_arm.o OBJS += armv4l/dsputil_arm.o endif +# sun mediaLib specific stuff +# currently only works when libavcodec is used in mplayer +ifeq ($(HAVE_MLIB),yes) +OBJS += mlib/dsputil_mlib.o +CFLAGS += $(MLIB_INC) +endif + SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) LIB= libavcodec.a @@ -58,8 +65,8 @@ depend: clean: rm -f *.o *~ *.a i386/*.o i386/*~ \ armv4l/*.o armv4l/*~ \ + mlib/*.o mlib/*~ \ libac3/*.o libac3/*~ \ - mpglib/*.o mpglib/*~ \ apiexample $(TESTS) distclean: clean |