From 39f7985ed253bee27b55eddcf684ee12628843d3 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Wed, 23 May 2018 07:39:48 +0300 Subject: [PATCH] test fix appveyor. Part 5 --- appveyor.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7f1b4c66322..ac7e6365fee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,14 +5,14 @@ skip_tags: true image: Visual Studio 2017 environment: matrix: - - tbs_arch: Win32 + - tbs_arch: x86 tbs_tools: mingw - tbs_arch: x64 tbs_tools: mingw - - tbs_arch: Win32 + - tbs_arch: x86 tbs_tools: msvc tbs_config: Debug - - tbs_arch: Win32 + - tbs_arch: x86 tbs_tools: msvc tbs_config: Release - tbs_arch: x64 @@ -29,17 +29,12 @@ install: } build_script: - git submodule update --init --recursive -- if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[Win32] ( +- if [%tbs_tools%]==[mingw] ( + SET PATH=C:\MinGW\bin;%PATH% && MKDIR bin && CD bin && - cmake .. && - make - ) -- if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[x64] ( - MKDIR bin && - CD bin && - cmake .. && - make + cmake .. -G "MinGW Makefiles"&& + mingw32-make ) - if [%tbs_tools%]==[msvc] ( msbuild "src\engine.sln" /m /verbosity:minimal /property:PlatformToolset=v141 /t:Clean,Build /p:Platform=%tbs_arch% /p:Configuration=%tbs_config% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"