diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-08-11 21:03:55 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-08-11 21:03:55 +0300 |
| commit | 78754d884da1794af339254245b7d79dcf33ea94 (patch) | |
| tree | fdc9c66ae54de41621b5ffe9006d36779e36658f | |
| parent | ae32dd9587a628ec4eb9a40a2d741dd7f832217e (diff) | |
Update build script to use VS2017 by default
| -rw-r--r-- | LAVFilters.sln | 2 | ||||
| -rw-r--r-- | build.bat | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/LAVFilters.sln b/LAVFilters.sln index 855174d2..3af3b980 100644 --- a/LAVFilters.sln +++ b/LAVFilters.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 +# Visual Studio 15 VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 14.0.24720.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LAVSplitter", "demuxer\LAVSplitter\LAVSplitter.vcxproj", "{F475F86F-3F7F-4B1D-82A6-078339F599FD}" @@ -1,6 +1,11 @@ @ECHO OFF -call "%VS140COMNTOOLS%vsvars32.bat" +for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( + set VSInstallDir=%%i +) + +set "VSCMD_START_DIR=%CD%" +call "%VSInstallDir%\Common7\Tools\VsDevCmd.bat" -no_logo -arch=x86 > NUL sh build_ffmpeg.sh x86 || EXIT /B 1 MSBuild.exe LAVFilters.sln /nologo /m /t:Rebuild /property:Configuration=Release;Platform=Win32 |