Update batch build tool library paths for MSVC 2015.

FossilOrigin-Name: d431d4e11a6006473ac223e58806ac26050934d5

diff --git a/manifest b/manifest
index 427414cf47e72f02e492a1ba06a350a889e22da6..6139fd543135f3dd7a8a97044714ee75b7f8967d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sxfer\soptimization\sfor\sWITHOUT\sROWID\stables\sso\sthat\sit\scorrectly\nupdates\sthe\schange\scount\sreturned\sby\ssqlite3_changes().
-D 2015-07-28T18:53:37.424
+C Update\sbatch\sbuild\stool\slibrary\spaths\sfor\sMSVC\s2015.
+D 2015-07-28T19:35:26.153
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4de3ef40c8b3b75c0c55ff4242a43c8ce1ad90ee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1310,7 +1310,7 @@ F test/without_rowid6.test db0dbf03c49030aa3c1ba5f618620334bd2baf5f
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
-F tool/build-all-msvc.bat 9058bd90a3c078a3d8c17d40e853aaa0f47885f4 x
+F tool/build-all-msvc.bat 5335cc89307513da8d795e31792011f79b953a3c x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -1366,7 +1366,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c98175e900cdda0c81fb559fed4cc5f27c34e368
-R e96dcbd757ba5f6ebb95dab5feb99125
-U drh
-Z 39b41622c8bd60fb5611285cfd384da5
+P eff43715d1a3a9ce3fe5da194dbb76ec0c06e13c
+R fcbab18774acd57d2be87895170a725d
+T *branch * msvc2015
+T *sym-msvc2015 *
+T -sym-trunk *
+U mistachkin
+Z 17993e8e393f9f96ce3dc43c11e7dc1a

diff --git a/manifest.uuid b/manifest.uuid
index 5cbd66c769f12b63d9e033963db5f1445e6a7e9e..2f2f04e8f9d2cf260dee44f4c817d03fe73df4d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eff43715d1a3a9ce3fe5da194dbb76ec0c06e13c
\ No newline at end of file
+d431d4e11a6006473ac223e58806ac26050934d5
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 9f5176db9deff0ffb09bcb4e5447981c4b350a71..ea85ecae98ad49635ce981e1797728ee160b1fe4 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -312,6 +312,13 @@ IF "%VisualStudioVersion%" == "11.0" (
   )\r
 )\r
 \r
+REM\r
+REM NOTE: This is the name of the sub-directory where the Windows 10.0 SDK\r
+REM       libraries may be found.  It is only used when compiling with the\r
+REM       Windows 10.0 SDK.\r
+REM\r
+SET WIN10LIBDIR=10.0.10150.0\r
+\r
 REM\r
 REM NOTE: Check if this is the Windows Phone SDK.  If so, a different batch\r
 REM       file is necessary to setup the build environment.  Since the variable\r
@@ -482,9 +489,9 @@ FOR %%P IN (%PLATFORMS%) DO (
             REM       different directory naming conventions.\r
             REM\r
             IF DEFINED USE_WINV100_NSDKLIBPATH (\r
-              CALL :fn_AppendVariable NSDKLIBPATH \..\10\lib\10.0.10030.0\um\x86\r
+              CALL :fn_AppendVariable NSDKLIBPATH \..\10\lib\%WIN10LIBDIR%\um\x86\r
               CALL :fn_CopyVariable UniversalCRTSdkDir PSDKLIBPATH\r
-              CALL :fn_AppendVariable PSDKLIBPATH Lib\10.0.10030.0\um\%%D\r
+              CALL :fn_AppendVariable PSDKLIBPATH Lib\%WIN10LIBDIR%\um\%%D\r
             ) ELSE IF DEFINED USE_WINV63_NSDKLIBPATH (\r
               CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86\r
             ) ELSE IF "%VisualStudioVersion%" == "12.0" (\r
@@ -507,7 +514,7 @@ FOR %%P IN (%PLATFORMS%) DO (
         IF DEFINED SET_NUCRTLIBPATH (\r
           IF DEFINED UniversalCRTSdkDir (\r
             CALL :fn_CopyVariable UniversalCRTSdkDir NUCRTLIBPATH\r
-            CALL :fn_AppendVariable NUCRTLIBPATH \lib\winv10.0\ucrt\x86\r
+            CALL :fn_AppendVariable NUCRTLIBPATH \lib\%WIN10LIBDIR%\ucrt\x86\r
           )\r
         )\r
 \r