diff options
| author | Bradley Sepos <[email protected]> | 2017-12-28 14:50:29 -0500 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-01-10 01:39:55 -0500 |
| commit | a230d06074defae003bf68df419907d08c64a16b (patch) | |
| tree | 4c4697208d97cf8bef0e63922b68aa68989f4156 | |
| parent | 680474d4df9fdcc96d00c459d0fe529db11320a1 (diff) | |
contrib: Make x264 cross options valid for all cross, not just mingw.
Also set CONFIGURE.build to null since the configure script has no clue about --build.
| -rw-r--r-- | contrib/x264/module.defs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index 220e756e8..b8a5d2d5a 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -12,7 +12,8 @@ X264.CONFIGURE.shared = X264.CONFIGURE.extra += --disable-lavf --disable-ffms --disable-avs --disable-swscale --disable-gpac --disable-lsmash --disable-cli -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1,$(BUILD.cross)) + X264.CONFIGURE.build = X264.CONFIGURE.extra += --cross-prefix=$(BUILD.spec)- X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)" X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)" |