Update our Win32 builds to use MSVC 2015 instead of MSVC 2013

This is so the new JSON library we're using doesn't break things. :) Note also the "8.1" added to the end of the vcvars line in the batch file, so the correct SDK is selected. Without it, when both MSVC 2015 & MSVC 2017 are installed, the MSVC 2015 installation (by default) will be unable to find rc.exe.
quanning · Mar 10, 2019 · 064514a · 064514a
1 parent 45c1e2a
commit 064514a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ if(WIN32 AND MSVC)
 	else()
 		# Paths for 32-bit windows builds
 		set(OPENSSL_PATH "C:/dev/OpenSSL-Win32" CACHE PATH "OpenSSL Path")
-		set(QT5_PATH "C:/dev/Qt/5.7/msvc2013" CACHE PATH "Qt5 Path")
+		set(QT5_PATH "C:/dev/Qt/5.7/msvc2015" CACHE PATH "Qt5 Path")
 
                 # Choose between SQLCipher or SQLite, depending whether
                 # -Dsqlcipher=1 is passed on the command line

diff --git a/installer/windows/nightly_build_scripts/win32build.bat b/installer/windows/nightly_build_scripts/win32build.bat
@@ -50,7 +50,7 @@ git clean -dffx
 :: WIN32 SQLITE BUILD PROCEDURE
 
 :: Set path variables
-CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\vcvars32.bat"
+CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\vcvars32.bat" 8.1
 
 :: Build SQLite x86
 CD %SQLITE_DIR%
@@ -65,7 +65,7 @@ cl /MD extension-functions.c -link -dll -def:extension-functions.def -out:math.d
 CD C:\\builds
 MKDIR "release-sqlite-win32"
 CD "release-sqlite-win32"
-cmake -G "Visual Studio 12 2013" -Wno-dev C:\\git_repos\\sqlitebrowser
+cmake -G "Visual Studio 14 2015" -Wno-dev C:\\git_repos\\sqlitebrowser
 
 :: Build package
 devenv /Build Release sqlitebrowser.sln /project "ALL_BUILD"
@@ -81,7 +81,7 @@ nmake /f Makefile.msc sqlcipher.dll USE_AMALGAMATION=1 NO_TCL=1 SQLITE3DLL=sqlci
 CD C:\\builds
 MKDIR "release-sqlcipher-win32"
 CD "release-sqlcipher-win32"
-cmake -G "Visual Studio 12 2013" -Wno-dev -Dsqlcipher=1 C:\\git_repos\\sqlitebrowser
+cmake -G "Visual Studio 14 2015" -Wno-dev -Dsqlcipher=1 C:\\git_repos\\sqlitebrowser
 
 :: Build package
 devenv /Build Release sqlitebrowser.sln /project "ALL_BUILD"

diff --git a/installer/windows/variables.wxi b/installer/windows/variables.wxi
@@ -36,16 +36,16 @@
         The Visual C++ runtime merge modules are installed with Visual Studio and are located in this directory.
     VCRedistFile
         The Visual C++ runtime file. This file is usually named "Microsoft_[VERSION]_CRT_[ARCH].msm". "VERSION" is the
-        Visual Studio version the application is built with. Use VC120 (version 12.0) if the application is built with
-        Visual Studio 2013. The build "ARCH" will be set automatically.
+        Visual Studio version the application is built with. Use VC140 (version 14.0) if the application is built with
+        Visual Studio 2015. The build "ARCH" will be set automatically.
     -->
 
     <?if $(sys.BUILDARCH)="x64"?>
         <?define VCRedistPath="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\MergeModules" ?>
         <?define VCRedistFile="Microsoft_VC141_CRT_$(sys.BUILDARCH).msm" ?>
     <?elseif $(sys.BUILDARCH)="x86"?>
         <?define VCRedistPath="C:\Program Files (x86)\Common Files\Merge Modules" ?>
-        <?define VCRedistFile="Microsoft_VC120_CRT_$(sys.BUILDARCH).msm" ?>
+        <?define VCRedistFile="Microsoft_VC140_CRT_$(sys.BUILDARCH).msm" ?>
     <?endif?>
 
     <!--
@@ -62,7 +62,7 @@
         <?define SQLiteExePath="C:\builds\release-sqlite-win64\Release" ?>
         <?define SQLCipherExePath="C:\builds\release-sqlcipher-win64\Release" ?>
     <?elseif $(sys.BUILDARCH)="x86"?>
-        <?define QtPath="C:\dev\Qt\5.7\msvc2013" ?>
+        <?define QtPath="C:\dev\Qt\5.7\msvc2015" ?>
         <?define SQLitePath="C:\dev\SQLite-Win32" ?>
         <?define SQLCipherPath="C:\git_repos\SQLCipher-Win32" ?>
         <?define OpenSSLPath="C:\dev\OpenSSL-Win32" ?>