summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-12-05 17:00:30 +0000
committerjstebbins <[email protected]>2014-12-05 17:00:30 +0000
commitd729b522d96133aef1849b4adf918dfa26ad6e66 (patch)
treee297a6a92139c325eb139f4c35bdaa5087b2a9be /libhb
parent08bcbdd649590f18f4909a613d7faffabc2e2009 (diff)
contrib: build and link new jansson lib
No new functionality yet. To be used for new json APIs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6590 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/module.defs10
1 files changed, 5 insertions, 5 deletions
diff --git a/libhb/module.defs b/libhb/module.defs
index f45c7e40b..a6eb72fe9 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,6 +1,6 @@
__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
- LIBDVDREAD LIBDVDNAV LIBICONV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
- PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX
+ LIBDVDREAD LIBDVDNAV LIBICONV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS \
+ LIBXML2 PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
$(eval $(call import.GCC,LIBHB))
@@ -105,9 +105,9 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
- ass avcodec avformat avutil avresample dvdnav dvdread \
- fontconfig freetype mp3lame \
- ogg samplerate swscale vpx theora vorbis vorbisenc x264 xml2 bluray, \
+ ass avcodec avformat avutil avresample dvdnav dvdread fontconfig \
+ freetype mp3lame ogg samplerate swscale vpx theora vorbis vorbisenc \
+ x264 xml2 bluray jansson, \
$(CONTRIB.build/)lib/lib$(n).a )
ifeq (1,$(FEATURE.fdk_aac))