diff options
| author | sr55 <[email protected]> | 2007-07-14 21:13:09 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2007-07-14 21:13:09 +0000 |
| commit | ffd763ba78f73855cb9a0077bdcd7d31483ec647 (patch) | |
| tree | a87e8948f336ee5abbca5fcb30957d5d98a5ba93 /libhb | |
| parent | 03392dfec9bdb60d4ce2a6e69b3864ce1e0e74b3 (diff) | |
Update makefile in libhb for libmkv
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@686 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libhb/Makefile b/libhb/Makefile index cf92b481a..6135b1161 100644 --- a/libhb/Makefile +++ b/libhb/Makefile @@ -24,7 +24,7 @@ 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 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) |