From b07884c1da3f9afc4d3716e9c538d281e8021eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20L?= Date: Tue, 6 Nov 2018 23:52:03 +0100 Subject: [PATCH] ci(win): use VS2015 to fix build errors `constexpr function 'qCountLeadingZeroBits' cannot result in a constant expression` --- CI/install-setup-qt.cmd | 2 +- appveyor.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/install-setup-qt.cmd b/CI/install-setup-qt.cmd index b756efb3..e7dc3784 100644 --- a/CI/install-setup-qt.cmd +++ b/CI/install-setup-qt.cmd @@ -2,5 +2,5 @@ REM Set default values to use AppVeyor's built-in Qt. set QTDIR32=C:\Qt\5.10.1\msvc2015 -set QTDIR64=C:\Qt\5.10.1\msvc2017_64 +set QTDIR64=C:\Qt\5.10.1\msvc2015_64 set QTCompileVersion=5.10.1 diff --git a/appveyor.yml b/appveyor.yml index 1b2c9595..c12a2501 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,9 +15,9 @@ install: - mkdir build32 - mkdir build64 - cd ./build32 - - cmake -G "Visual Studio 15 2017" -DQTDIR="%QTDIR32%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. + - cmake -G "Visual Studio 14 2015" -DQTDIR="%QTDIR32%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. - cd ../build64 - - cmake -G "Visual Studio 15 2017 Win64" -DQTDIR="%QTDIR64%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. + - cmake -G "Visual Studio 14 2015 Win64" -DQTDIR="%QTDIR64%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. build_script: - call msbuild /m /p:Configuration=%build_config% C:\projects\obs-websocket\build32\obs-websocket.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"