From 13e4fc1725bc45b9f59adcba9228f0554dc90e35 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Fri, 5 Oct 2012 22:40:03 +0000 Subject: LinGui: use more system libs use system libs for fontconfig, freetype, libxml2, libass, libogg, libvorbis, libtheora, and libsamplerate update build dependencies for ubuntu packages update documentation to reflect new build dependencies fix a problem with hb.h conflict with harfbuzz/hb.h git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5001 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- make/include/main.defs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'make/include') diff --git a/make/include/main.defs b/make/include/main.defs index ff6e73f2a..5a7519e50 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -28,24 +28,24 @@ endif endif ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) + MODULES += contrib/fontconfig + MODULES += contrib/freetype MODULES += contrib/fribidi + MODULES += contrib/libxml2 + MODULES += contrib/libass + MODULES += contrib/libogg + MODULES += contrib/libvorbis + MODULES += contrib/libtheora + MODULES += contrib/libsamplerate endif +MODULES += contrib/lame MODULES += contrib/faac MODULES += contrib/ffmpeg -MODULES += contrib/fontconfig -MODULES += contrib/freetype -MODULES += contrib/lame -MODULES += contrib/libass MODULES += contrib/libdvdread MODULES += contrib/libdvdnav MODULES += contrib/libbluray MODULES += contrib/libmkv -MODULES += contrib/libogg -MODULES += contrib/libsamplerate -MODULES += contrib/libtheora -MODULES += contrib/libvorbis -MODULES += contrib/libxml2 MODULES += contrib/mp4v2 MODULES += contrib/mpeg2dec -- cgit v1.2.3