diff options
| author | Bradley Sepos <[email protected]> | 2018-06-10 16:31:46 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-17 00:23:34 -0400 |
| commit | 517ed0030f340d3b8f3f2aee1cbac23f5e9da30a (patch) | |
| tree | 5e99d507f3cc5bbb3d727d0167e6d14385e80c3b /contrib/ffmpeg | |
| parent | 980795ec6461d49cac26afc7e3a36a2917f84f4e (diff) | |
contrib: make: Remove --enable-local-autotools and --enable-local-pkgconfig.
Closes #549.
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 690f2c1e7..47a67aa99 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -81,13 +81,9 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) FFMPEG.CONFIGURE.extra += \ --target-os=mingw32 \ --arch=$(BUILD.machine) \ - --cross-prefix=$(BUILD.cross.prefix) + --cross-prefix=$(BUILD.cross.prefix) \ + --pkg-config=$(PKGCONFIG.exe) 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)) |