[Piglit] [PATCH 2/2] appveyor: Allow building with MSVC too.

Jose Fonseca jfonseca at vmware.com
Fri Apr 21 11:38:14 UTC 2017


Disabled by default, as I'm not sure it's worth supporting MSVC build.
---
 appveyor.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 54e7a420f..302308599 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,18 +35,26 @@ clone_depth: 100
 
 cache:
 - freeglut-MinGW-3.0.0-1.mp.zip
+- freeglut-MinGW-3.0.0-2.mp.zip
 
 # https://www.appveyor.com/docs/build-environment/#build-worker-images
 os: Visual Studio 2015
 
 environment:
   PYTHON_HOME: C:\Python36
-  FREEGLUT_ARCHIVE: freeglut-MinGW-3.0.0-1.mp.zip
   matrix:
   - MINGW_HOME: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32
+    FREEGLUT_ARCHIVE: freeglut-MinGW-3.0.0-1.mp.zip
     FREEGLUT_LIB: lib\libfreeglut.a
   - MINGW_HOME: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64
+    FREEGLUT_ARCHIVE: freeglut-MinGW-3.0.0-1.mp.zip
     FREEGLUT_LIB: lib\x64\libfreeglut.a
+# - MSVC_ARCH: x86
+#   FREEGLUT_ARCHIVE: freeglut-MSVC-3.0.0-2.mp.zip
+#   FREEGLUT_LIB: lib\freeglut.lib
+# - MSVC_ARCH: x86_amd64
+#   FREEGLUT_ARCHIVE: freeglut-MSVC-3.0.0-2.mp.zip
+#   FREEGLUT_LIB: lib\x64\freeglut.lib
 
 matrix:
   fast_finish: true
@@ -68,6 +76,8 @@ install:
 - ninja --version
 # Setup MinGW
 - if not "%MINGW_HOME%"=="" set Path=%MINGW_HOME%\bin;%Path%
+# Setup MSVC
+- if not "%MSVC_ARCH%"=="" call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %MSVC_ARCH%
 # Install FreeGlut
 - if not exist "%FREEGLUT_ARCHIVE%" appveyor DownloadFile "http://files.transmissionzero.co.uk/software/development/GLUT/%FREEGLUT_ARCHIVE%"
 - 7z x -y "%FREEGLUT_ARCHIVE%" > nul
-- 
2.11.0



More information about the Piglit mailing list