From 211159290571c133f18adf2f1d167b056d4b6d47 Mon Sep 17 00:00:00 2001
From: Thomas Daede <daede003@umn.edu>
Date: Tue, 16 Oct 2018 13:11:31 -0700
Subject: [PATCH] Switch libaom to nasm, and remove yasm dependency.
---
.travis.yml | 1 -
appveyor.yml | 1 -
build.rs | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c914f525..7839382d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: rust
addons:
apt:
packages:
- - yasm
- nasm
before_install:
diff --git a/appveyor.yml b/appveyor.yml
index c6788c68..76110aca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,6 @@ environment:
install:
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- - appveyor DownloadFile http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe -FileName yasm.exe
- appveyor DownloadFile https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-win64.zip -FileName nasm.zip
- 7z e -y nasm.zip
- rustup-init -yv --default-toolchain %channel% --default-host %target%
diff --git a/build.rs b/build.rs
index cc6a321c..4a93a199 100644
--- a/build.rs
+++ b/build.rs
@@ -51,6 +51,7 @@ fn main() {
.define("CONFIG_DEBUG", (debug as u8).to_string())
.define("CONFIG_ANALYZER", "0")
.define("ENABLE_DOCS", "0")
+ .define("ENABLE_NASM", "1")
.define("ENABLE_TESTS", "0")
.no_build_target(cfg!(windows))
.build();
--
GitLab