summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorbradleys <[email protected]>2014-10-15 23:32:41 +0000
committerbradleys <[email protected]>2014-10-15 23:32:41 +0000
commit5996c99f899f8a76289ae30b4b46277a4009179e (patch)
tree8298a85f55142f9716facda2073b5375a019626c /libhb
parent5e35f6400466af7051aba28a29c4c06738c80b55 (diff)
contrib: Add libgnurx to provide POSIX regex on Windows.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6445 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/module.defs8
1 files changed, 7 insertions, 1 deletions
diff --git a/libhb/module.defs b/libhb/module.defs
index b1920fdbd..f45c7e40b 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
+ PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
$(eval $(call import.GCC,LIBHB))
@@ -128,6 +128,12 @@ else
LIBHB.GCC.l += iconv
endif
+ifneq ($(HAS.regex),1)
+LIBHB.dll.libs += $(CONTRIB.build/)lib/libregex.a
+else
+ LIBHB.GCC.l += regex
+endif
+
ifeq (1,$(FRIBIDI.enabled))
LIBHB.dll.libs += $(CONTRIB.build/)lib/libfribidi.a
else