From db901e3d83bb41fdd0d77768a264e25af249fac4 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 17 Jun 2015 19:20:21 +0200 Subject: Test glutin with MSVC++ --- Cargo.toml | 2 +- appveyor.yml | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 18e7e0a..3295a02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ shared_library = "0.1.0" [build-dependencies] gl_generator = "0.0.26" -khronos_api = "0.0.6" +khronos_api = "0.0.7" [dev-dependencies] clock_ticks = "0.0.5" diff --git a/appveyor.yml b/appveyor.yml index 17bad94..b3ec520 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,19 +1,21 @@ +environment: + CARGO_TARGET: x86_64-pc-windows-gnu + matrix: + - TARGET: x86_64-pc-windows-msvc + - TARGET: i686-pc-windows-gnu install: - - ps: | - if ($env:PLATFORM -eq "x86") { - Start-FileDownload 'https://static.rust-lang.org/dist/rust-1.0.0-i686-pc-windows-gnu.exe' -FileName rust.exe - } else { - Start-FileDownload 'https://static.rust-lang.org/dist/rust-1.0.0-x86_64-pc-windows-gnu.exe' -FileName rust.exe - } - - rust.exe /VERYSILENT /NORESTART /DIR="C:\Program Files\Rust" - - SET PATH=%PATH%;C:\Program Files\Rust\bin - - rustc -vV + - ps: Start-FileDownload "https://static.rust-lang.org/dist/rustc-nightly-${env:TARGET}.tar.gz" + - ps: Start-FileDownload "https://static.rust-lang.org/cargo-dist/cargo-nightly-${env:CARGO_TARGET}.tar.gz" + - 7z x rustc-nightly-%TARGET%.tar.gz > nul + - 7z x rustc-nightly-%TARGET%.tar > nul + - 7z x cargo-nightly-%CARGO_TARGET%.tar.gz > nul + - 7z x cargo-nightly-%CARGO_TARGET%.tar > nul + - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 + - set PATH=%PATH%;%cd%/rustc-nightly-%TARGET%/rustc/bin + - set PATH=%PATH%;%cd%/cargo-nightly-%CARGO_TARGET%/cargo/bin + - SET PATH=%PATH%;C:\MinGW\bin + - rustc -V - cargo -V - - git submodule update --init --recursive - -platform: - - x86 - - x64 build: false -- cgit v1.2.3