]> granicus.if.org Git - handbrake/commitdiff
Don't override fribidi lib and cflags when building libass on linux
authorjstebbins <jstebbins.hb@gmail.com>
Fri, 8 Jun 2012 21:34:23 +0000 (21:34 +0000)
committerjstebbins <jstebbins.hb@gmail.com>
Fri, 8 Jun 2012 21:34:23 +0000 (21:34 +0000)
We use the system version of fribidi on linux and overriding the build
flags causes failures on some systems (gentoo).

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4726 b64f7644-9d1e-0410-96f1-a4d463321fa5

contrib/libass/module.defs

index 556d7cc0b0fc92ca5be8a40a28e4ec17d6f9571e..6fd06777757fbfaea800beb4329fa0d0c2d2287d 100644 (file)
@@ -11,6 +11,10 @@ LIBASS.CONFIGURE.extra = \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
     FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
     FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
-    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include" \
+    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+
+ifneq ($(BUILD.system),linux)
+LIBASS.CONFIGURE.extra += \
     FRIBIDI_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfribidi" \
     FRIBIDI_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+endif