diff options
| author | Bradley Sepos <[email protected]> | 2016-09-03 01:04:08 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2016-09-03 01:29:08 -0400 |
| commit | ed0be87a9c8a6989b2b45f7b4135a0b2401c0756 (patch) | |
| tree | e2e4930b19b33330cf55c77953c3969304d9ec6f /contrib/ffmpeg | |
| parent | f0efd991702051364e375da06546a64951f24dca (diff) | |
contrib: Use PKGCONFIG.exe when building libav on mingw.
Fixes broken external libraries such as opus, and needed for libav 12, anyway.
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index ccb61eca1..bb27b953d 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -92,6 +92,11 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) --arch=$(BUILD.machine) \ --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix) FFMPEG.GCC.args.extra += -fno-common + ifeq (1,$(FEATURE.local_pkgconfig)) + FFMPEG.CONFIGURE.extra += --pkg-config="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/$(PKGCONFIG.exe))" + else + FFMPEG.CONFIGURE.extra += --pkg-config=$(PKGCONFIG.exe) + endif endif ifneq (none,$(FFMPEG.GCC.g)) |