premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

msvc-12 doesn't support default move constructors (simulator requires that). use msvc-14

This commit is contained in:
arvidn 2015-08-23 23:19:18 +02:00 committed by arvidn
parent 2d1bb24490
commit 376126d04d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
appveyor.yml
View File

@ -7,9 +7,15 @@ clone_depth: 1
environment: environment:
matrix: matrix:
- variant: test_debug - variant: test_debug
compiler: msvc-12.0 compiler: msvc-14.0
x64: 1 x64: 1
sim: 1 sim: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2015\\include"'
- variant: test_debug
compiler: msvc-12.0
x64: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
@ -18,11 +24,6 @@ environment:
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2010\\include"' include: '"c:\\openssl-1.0.1p-vs2010\\include"'
- variant: test_debug
compiler: msvc-14.0
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2015\\include"'
- variant: test_barebones - variant: test_barebones
compiler: msvc-12.0 compiler: msvc-12.0
x64: 1 x64: 1
@ -110,6 +111,6 @@ build_script:
- python test.py - python test.py
- if defined sim ( - if defined sim (
cd %ROOT_DIRECTORY%\simulation cd %ROOT_DIRECTORY%\simulation
&& b2.exe --hash -j2 crypto=built-in %compiler% && b2.exe --hash -j2 link=shared crypto=built-in %compiler%
) )