diff options
| -rw-r--r-- | contrib/libass/module.defs | 8 | ||||
| -rw-r--r-- | libhb/module.defs | 8 | ||||
| -rw-r--r-- | make/include/main.defs | 4 | ||||
| -rw-r--r-- | test/module.defs | 2 |
4 files changed, 9 insertions, 13 deletions
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs index 820171443..0d9ca099a 100644 --- a/contrib/libass/module.defs +++ b/contrib/libass/module.defs @@ -1,6 +1,6 @@ __deps__ := YASM FREETYPE FRIBIDI HARFBUZZ -ifneq ($(BUILD.system),darwin) +ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) __deps__ += FONTCONFIG endif @@ -17,7 +17,7 @@ LIBASS.CONFIGURE.extra = \ FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \ FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \ -ifneq ($(BUILD.system),darwin) +ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) # Tell configure where to find our version of fontconfig LIBASS.CONFIGURE.extra += \ --enable-fontconfig \ @@ -39,7 +39,3 @@ ifneq (1,$(BUILD.cross)) LIBASS.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" endif endif - -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) - LIBASS.CONFIGURE.extra += --disable-directwrite -endif diff --git a/libhb/module.defs b/libhb/module.defs index 8ea828bfa..616fcb323 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -1,8 +1,12 @@ -__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \ +__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \ LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \ LIBXML2 PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \ HARFBUZZ LIBOPUS +ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) + __deps__ += FONTCONFIG +endif + $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) $(eval $(call import.GCC,LIBHB)) @@ -122,7 +126,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - ass avcodec avformat avfilter avutil avresample dvdnav dvdread fontconfig \ + ass avcodec avformat avfilter avutil avresample dvdnav dvdread \ freetype mp3lame samplerate swscale vpx theora vorbis vorbisenc ogg \ x264 xml2 bluray jansson harfbuzz opus, \ $(CONTRIB.build/)lib/lib$(n).a ) diff --git a/make/include/main.defs b/make/include/main.defs index a2ca1ded8..07bdd31cb 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -41,10 +41,6 @@ ifneq ($(HAS.bz2),1) endif endif -ifneq (,$(filter $(BUILD.system),cygwin mingw)) - MODULES += contrib/fontconfig -endif - ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) MODULES += contrib/freetype MODULES += contrib/fribidi diff --git a/test/module.defs b/test/module.defs index 5f19ebecc..1202a657f 100644 --- a/test/module.defs +++ b/test/module.defs @@ -19,7 +19,7 @@ TEST.GCC.l = \ samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \ bluray freetype xml2 bz2 z jansson harfbuzz opus -ifneq ($(BUILD.system),darwin) +ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) TEST.GCC.l += fontconfig endif |