diff options
| author | jstebbins <[email protected]> | 2012-06-08 21:34:23 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2012-06-08 21:34:23 +0000 |
| commit | 62733781aff54e2f1eff95268d575bdee0c13335 (patch) | |
| tree | 4690951f099badf06bd222058e04d61182afd386 /contrib | |
| parent | 54b5378281d7a540e5456abddb9ee1673f4ee18b (diff) | |
Don't override fribidi lib and cflags when building libass on linux
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libass/module.defs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs index 556d7cc0b..6fd067777 100644 --- a/contrib/libass/module.defs +++ b/contrib/libass/module.defs @@ -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 |