Use the arguments to NMAKE consistently in the MSVC batch build tool.

FossilOrigin-Name: 480e5049486b8b047f533d78b040daa47dd6b946

diff --git a/manifest b/manifest
index 89b9fc9d7b875cdba004b4f78032095e897211f9..e8f5966687c6a649c96ed987a630ceed7991dffc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sclean\starget\sin\sthe\sMSVC\smakefiles.
-D 2016-02-19T19:03:04.706
+C Use\sthe\sarguments\sto\sNMAKE\sconsistently\sin\sthe\sMSVC\sbatch\sbuild\stool.
+D 2016-02-19T19:29:44.729
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 28fc4ee02333996d31b3602b39eeb8e609a89ce4
@@ -1367,7 +1367,7 @@ F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
 F tool/GetTclKit.bat 629d87562e0487c386db630033931d12d62e6372
 F tool/addopcodes.tcl 4ca9c3ef196f08da30add5d07ce0c9458dc8c633
-F tool/build-all-msvc.bat fba6e16e6bad4600b6ab278ca90b1fcf74de63de x
+F tool/build-all-msvc.bat 55be1cf8545dabd69df2ba6b3de6868da0c26f52 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/cg_anno.tcl 692ce4b8693d59e3a3de77ca97f4139ecfa641b0 x
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 72b10e5e7d2db436c7b03cc3735a2e9d0e53ab5d
-R b7460cecc6b485f24aba529c416ef3bb
+P 66a9ad4a6df513f4c35c3d337d4e2e80cd38d586
+R abade97baee8abed51650334fbde09aa
 U mistachkin
-Z 44264aeb20df837b180d552e8068cd8f
+Z 7b92d09a61d34a4957d04f9633ed77f9

diff --git a/manifest.uuid b/manifest.uuid
index 5eebc0a2af9c549886301eb70cdeea62d4f2f69d..613e1048a07547fdb92d313d467384c6e8abc5e2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-66a9ad4a6df513f4c35c3d337d4e2e80cd38d586
\ No newline at end of file
+480e5049486b8b047f533d78b040daa47dd6b946
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index c09ab1cd1c464a5489e5a152981fd6f596ed9285..c96708cef564f0d586d87411caa9835bbb7e03fa 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -758,7 +758,7 @@ REM
 GOTO no_errors\r
 \r
 :fn_MakeClean\r
-  %__ECHO% %NMAKE_CMD% clean "PLATFORM=%1" %NMAKE_ARGS% %NMAKE_ARGS_CFG%\r
+  %__ECHO% %NMAKE_CMD% clean "PLATFORM=%1" XCOMPILE=1 USE_NATIVE_LIBPATHS=1 NO_TCL=1 %NMAKE_ARGS% %NMAKE_ARGS_CFG%\r
   GOTO :EOF\r
 \r
 :fn_MakeDll\r