X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2FMakefile;h=6135b116106a528df893722e7e6b3658d9bc69b6;hb=623463cc5a68d65ff2f7f7a635ad569a9375925f;hp=6604ec428b675dfd9e3cedd25f7ed73d3aca84d4;hpb=9fc90d029706f970a16553ce5a55ba31d838173a;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/Makefile b/libhb/Makefile
index 6604ec42..6135b116 100644
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -22,9 +22,9 @@ ifeq ($(SYSTEM),Linux)
 endif
 
 SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c \
-	   update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c \
+	   update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \
 	   muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \
-	   decavcodec.c encxvid.c muxavi.c enclame.c muxogm.c encvorbis.c \
+	   decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \
 	   dvd.c  ipodutil.cpp
 OTMP = $(SRCS:%.c=%.o) 
 OBJS = $(OTMP:%.cpp=%.o)
@@ -38,7 +38,8 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
 		   ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \
 		   ../contrib/lib/libvorbisfile.a ../contrib/lib/libogg.a \
 		   ../contrib/lib/libsamplerate.a ../contrib/lib/libx264.a \
-		   ../contrib/lib/libxvidcore.a  ../contrib/lib/libmp4v2.a
+		   ../contrib/lib/libxvidcore.a  ../contrib/lib/libmp4v2.a \
+		   ../contrib/lib/libmkv.a
 else
 CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
 		   ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
@@ -46,7 +47,7 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
 		   ../contrib/lib/libdvdcss.a ../contrib/lib/libfaac.a \
 		   ../contrib/lib/libmp3lame.a ../contrib/lib/libmpeg2.a \ ../contrib/lib/libmpeg2convert.a ../contrib/lib/libvorbis.a \ ../contrib/lib/libvorbisenc.a ../contrib/lib/libvorbisfile.a \ ../contrib/lib/libogg.a ../contrib/lib/libsamplerate.a \
 		   ../contrib/lib/libx264.a ../contrib/lib/libxvidcore.a \
-		   ../contrib/lib/libmp4v2.a
+		   ../contrib/lib/libmp4v2.a ../contrib/lib/libmkv.a
 endif
 
 CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)