Document the NMAKE_ARGS environment variable as well.

FossilOrigin-Name: 977fd39c1509edec2e28cc8bac64e0994699f398

diff --git a/manifest b/manifest
index 3bd105c4f77c09e29e8a250ebf8991a4bce29c48..0180ba625a74c7a67202654d5df38a43ddf767b7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sdocumentation\sand\scomments\sin\sthe\sMSVC\sbatch\sbuild\stool.
-D 2015-04-19T18:58:29.991
+C Document\sthe\sNMAKE_ARGS\senvironment\svariable\sas\swell.
+D 2015-04-19T19:53:43.925
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1196,7 +1196,7 @@ F test/without_rowid6.test db0dbf03c49030aa3c1ba5f618620334bd2baf5f
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test fb3c0e4ab172d386954deda24c03f500e121d80d
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
-F tool/build-all-msvc.bat 78d530f024c22828ce882a3f0b892490aaaf3201 x
+F tool/build-all-msvc.bat 19be654f72b0b0ed4d2451a998c603a4eb65a60f x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -1251,7 +1251,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8469d651a0442a2bc572a869a0457a6ea8c06bc7
-R 05d8b709a19efc6c268ced1a9d746700
+P ca64ef079811006f3e0526919871ffd286c3e714
+R 52d9f3383650b84247283bfd77621eab
 U mistachkin
-Z 13c315b8e34663ea44d46ce0d67e7224
+Z 4ecdfe31e09fefcd24da72e520807bdb

diff --git a/manifest.uuid b/manifest.uuid
index f0b523375154afbf7e13aa63bdda8426d5439b73..1edabded57506eb44ab244be0b053064840d8226 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca64ef079811006f3e0526919871ffd286c3e714
\ No newline at end of file
+977fd39c1509edec2e28cc8bac64e0994699f398
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 090c6266d12f44943eceec7714c4544bf927193f..534ea75be6ac9cfc03dcd3fca542cd35e0410e05 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -87,6 +87,14 @@ REM When set, modifies how the NSDKLIBPATH environment variable is built, based
 REM on the WindowsSdkDir environment variable.  It causes this batch script to\r
 REM assume the Windows 10.0 SDK location should be used.\r
 REM\r
+REM                        NMAKE_ARGS\r
+REM\r
+REM When set, the value is expanded and passed to the NMAKE command line, after\r
+REM its other arguments.  This is used to specify additional NMAKE options, for\r
+REM example:\r
+REM\r
+REM                        SET NMAKE_ARGS=FOR_WINRT=1\r
+REM\r
 SETLOCAL\r
 \r
 REM SET __ECHO=ECHO\r