diff options
| author | Bradley Sepos <[email protected]> | 2016-05-27 20:52:58 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2016-05-27 20:53:01 -0400 |
| commit | 7aa4a16f51f701c3a10a474b17b37db7f5c661d1 (patch) | |
| tree | 3c01799a5b94b5813dd141a242bb9a770e9e2d9d /contrib | |
| parent | 93a52ea54d3979ceb720a74c3cb324fb68d4f792 (diff) | |
contrib: Fix libvpx building on Mac.
Was trying to use outdated system nasm instead of (local) yasm.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libvpx/module.defs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs index 7e4beb685..761385795 100644 --- a/contrib/libvpx/module.defs +++ b/contrib/libvpx/module.defs @@ -8,6 +8,7 @@ LIBVPX.FETCH.md5 = 49e59dd184caa255886683facea56fca LIBVPX.CONFIGURE.args.host = LIBVPX.CONFIGURE.deps = LIBVPX.CONFIGURE.extra = \ + --as=yasm \ --enable-vp8-encoder \ --enable-vp9-encoder \ --disable-vp9-decoder \ @@ -26,3 +27,8 @@ ifeq (1-i686,$(BUILD.cross)-$(BUILD.machine)) else ifeq (1-x86_64,$(BUILD.cross)-$(BUILD.machine)) LIBVPX.CONFIGURE.extra += --target=x86_64-win64-gcc endif + +ifeq (1,$(FEATURE.local_yasm)) + LIBVPX.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" + LIBVPX.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" +endif |