|
|
@@ -1,28 +1,24 @@
|
|
|
+image: Visual Studio 2017
|
|
|
environment:
|
|
|
CURL_VERSION: 7.56.1
|
|
|
|
|
|
install:
|
|
|
- git submodule update --init --recursive
|
|
|
- - if exist dependencies2015.zip (curl -kLO https://obsproject.com/downloads/dependencies2015.zip -f --retry 5 -z dependencies2015.zip) else (curl -kLO https://obsproject.com/downloads/dependencies2015.zip -f --retry 5 -C -)
|
|
|
+ - if exist dependencies2017.zip (curl -kLO https://obsproject.com/downloads/dependencies2017.zip -f --retry 5 -z dependencies2017.zip) else (curl -kLO https://obsproject.com/downloads/dependencies2017.zip -f --retry 5 -C -)
|
|
|
- if exist vlc.zip (curl -kLO https://obsproject.com/downloads/vlc.zip -f --retry 5 -z vlc.zip) else (curl -kLO https://obsproject.com/downloads/vlc.zip -f --retry 5 -C -)
|
|
|
- - 7z x dependencies2015.zip -odependencies2015
|
|
|
+ - 7z x dependencies2017.zip -odependencies2017
|
|
|
- 7z x vlc.zip -ovlc
|
|
|
- - set DepsPath32=%CD%\dependencies2015\win32
|
|
|
- - set DepsPath64=%CD%\dependencies2015\win64
|
|
|
+ - set DepsPath32=%CD%\dependencies2017\win32
|
|
|
+ - set DepsPath64=%CD%\dependencies2017\win64
|
|
|
- set VLCPath=%CD%\vlc
|
|
|
- set QTDIR32=C:\Qt\5.10.1\msvc2015
|
|
|
- - set QTDIR64=C:\Qt\5.10.1\msvc2015_64
|
|
|
+ - set QTDIR64=C:\Qt\5.10.1\msvc2017_64
|
|
|
- set build_config=RelWithDebInfo
|
|
|
- - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\um\d3d11on12*" "C:\Program Files (x86)\Windows Kits\8.1\Include\um"
|
|
|
- - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\um\d3d12*" "C:\Program Files (x86)\Windows Kits\8.1\Include\um"
|
|
|
- - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\shared\dxgi*" "C:\Program Files (x86)\Windows Kits\8.1\Include\shared"
|
|
|
- - mkdir build
|
|
|
- - mkdir build32
|
|
|
- - mkdir build64
|
|
|
+ - mkdir build build32 build64
|
|
|
- cd ./build32
|
|
|
- - cmake -G "Visual Studio 14 2015" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
|
|
|
+ - cmake -G "Visual Studio 15 2017" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
|
|
|
- cd ../build64
|
|
|
- - cmake -G "Visual Studio 14 2015 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
|
|
|
+ - cmake -G "Visual Studio 15 2017 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
|
|
|
|
|
|
build_script:
|
|
|
- call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build32\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
|
|
@@ -37,5 +33,5 @@ deploy_script:
|
|
|
test: off
|
|
|
|
|
|
cache:
|
|
|
- - dependencies2015.zip
|
|
|
+ - dependencies2017.zip
|
|
|
- vlc.zip
|
craftwar