Commit 7453bbd0 authored by Thomas Daede's avatar Thomas Daede

Re-enable building assembly files on Windows.

This doesn't actually call the assembly functdions yet.
parent be5eab1f
......@@ -40,7 +40,7 @@ rayon = "1.0"
bincode = "=1.0.1"
[target.'cfg(target_arch = "x86_64")'.build-dependencies]
nasm-rs = { version = "0.1.4", optional = true }
nasm-rs = { git = "https://github.com/tdaede/nasm-rs", branch="msvc-OUT", optional = true }
[target.'cfg(unix)'.build-dependencies]
pkg-config = "0.3.12"
......
......@@ -14,11 +14,12 @@ matrix:
- platform: arm64
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 https://people.xiph.org/~tdaede/nasm-2.14.02-win64.zip -FileName nasm.zip
- 7z e -y nasm.zip
- rustup-init -yv --default-toolchain %channel% --default-host %host%
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin;%APPVEYOR_BUILD_FOLDER%
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin;%APPVEYOR_BUILD_FOLDER%;nasm-2.14.02
- ps: $Env:PKG_CONFIG_ALLOW_CROSS=1
- rustc -vV
- cargo -vV
......
......@@ -22,7 +22,7 @@ fn rerun_dir<P: AsRef<Path>>(dir: P) {
}
fn main() {
#[cfg(all(target_arch = "x86_64", not(windows), feature = "nasm"))] {
#[cfg(all(target_arch = "x86_64", feature = "nasm"))] {
use std::fs::File;
use std::io::Write;
let out_dir = env::var("OUT_DIR").unwrap();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment