From 3f9232154785ad7ae90649d90be93244da203ccc Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 27 Jun 2018 11:57:27 +0100 Subject: [PATCH] Appveyor build settings - WindowsTargetPlatformVersion=10.0.17134.0; latest fixes, but believed still compatible with Windows 7. - Platform=Win32; - PreferredToolArchitecture=x64; 64 bit build tools can use more memory. - PlatformToolset=v141; v140 would use MSVC2015 tools. v141 matches MSVC2017 IDE builds. If we don't specify these, we get the defaults and could get wxWidgets compiled with SDK8.1 (default) and Audacity with a SDK 10. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fc5572976..55e6f76a2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,7 @@ install: # download wxWidgets - git clone --recurse-submodules --branch v3.1.1 --depth 1 https://github.com/audacity/wxWidgets.git %WXWIN% # build wxWidgets - - msbuild /m %WXWIN%\build\msw\wx_vc15.sln "/p:Configuration=DLL Release;PlatformToolset=v140;WholeProgramOptimization=true" /target:adv,base,core,html,net,qa,wxexpat,wxjpeg,wxpng,wxtiff,wxzlib,xml /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + - msbuild /m %WXWIN%\build\msw\wx_vc15.sln "/p:Configuration=DLL Release;Platform=Win32;PreferredToolArchitecture=x64;WindowsTargetPlatformVersion=10.0.17134.0;PlatformToolset=v141;WholeProgramOptimization=true" /target:adv,base,core,html,net,qa,wxexpat,wxjpeg,wxpng,wxtiff,wxzlib,xml /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" environment: WXWIN: '%APPVEYOR_BUILD_FOLDER%\..\wxWidgets' AUDACITY_ROOT: '%APPVEYOR_BUILD_FOLDER%' @@ -33,7 +33,7 @@ environment: #- Release build_script: # build all targets except `help` - cmd: >- - msbuild /m win/audacity.sln /p:Configuration=Release;PlatformToolset=v140;WholeProgramOptimization=true /target:expat,filedialog,libflac++,libflac,libid3tag,libmad,libnyquist,libogg,libscorealign,libsndfile,libsoxr,libvamp,libvorbis,lv2,portaudio-v19,portmidi,portmixer,portsmf,sbsms,soundtouch,twolame,Audacity /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && + msbuild /m win/audacity.sln /p:Configuration=Release;Platform=Win32;PreferredToolArchitecture=x64;WindowsTargetPlatformVersion=10.0.17134.0;PlatformToolset=v141;WholeProgramOptimization=true /target:expat,filedialog,libflac++,libflac,libid3tag,libmad,libnyquist,libogg,libscorealign,libsndfile,libsoxr,libvamp,libvorbis,lv2,portaudio-v19,portmidi,portmixer,portsmf,sbsms,soundtouch,twolame,Audacity /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && del /S win\Release\*.ipdb && del /S win\Release\*.iobj && del /S win\Release\*.lib &&