Update the MSVC autoconf makefile with the recent changes from the primary one.

FossilOrigin-Name: c7242aa3e9c08e0c019388e89a785a6e59c915d5

diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index ea31a32f77da0bbaf47703bb4ed6a05bfb05a451..3dfbb3d20ecc16689c0af97f64c84142a0264498 100644 (file)
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -536,8 +536,8 @@ RCC = $(RCC) -DWINAPI_FAMILY=WINAPI_FAMILY_APP
 # C compiler options for the Windows 10 platform (needs MSVC 2015).
 #
 !IF $(FOR_WIN10)!=0
-TCC = $(TCC) /guard:cf -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
-BCC = $(BCC) /guard:cf -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+TCC = $(TCC) /d2guard4 -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+BCC = $(BCC) /d2guard4 -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
 !ENDIF
 
 # Also, we need to dynamically link to the correct MSVC runtime
@@ -814,7 +814,7 @@ LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(PSDKLIBPATH)"
 !ENDIF
 
 !IF $(FOR_WIN10)!=0
-LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(UCRTLIBPATH)"
+LTLINKOPTS = $(LTLINKOPTS) /guard:cf "/LIBPATH:$(UCRTLIBPATH)"
 !IF $(DEBUG)>1
 LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:libucrtd.lib /DEFAULTLIB:ucrtd.lib
 !ELSE

diff --git a/manifest b/manifest
index 9c9255245b4db7dc687eb024d248524fe87b0026..542977d5e3f32900803f8f1dbc3db77a92fc44a6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\smakefiles\sin\sthe\sautoconf-tarball\sso\sthat\sthey\sbuild\sthe\scommand-line\nshell\swith\sSQLITE_ENABLE_EXPLAIN_COMMENTS.
-D 2016-02-09T20:37:46.079
+C Update\sthe\sMSVC\sautoconf\smakefile\swith\sthe\srecent\schanges\sfrom\sthe\sprimary\sone.
+D 2016-02-09T22:00:48.288
 F Makefile.in 95ea52e9c02962e31f986fe8ea5805104c84f94b
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 0fe3b22f8e29bcde0533ada7957a5f15835d797a
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 29e2a6e8d0c5e32723a48b4faf6b168854dde5f4
-F autoconf/Makefile.msc 28aa3bcecef3edcddf320a7631f92088c47cf00e
+F autoconf/Makefile.msc 3ab11cf4b564876efad3f0d59528388e4329b88b
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa
 F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 61951b153d47096f30ebc8b84af408d9d709637c
-R d75c460e141623bfe7fb7110cba37d7d
-U drh
-Z 11eb657dc7f95c0de93cd1d08c7016df
+P 1135ad014aac8a4ae5169375af1b368feaa8331b
+R 9aa873b7c8d29e72fd134e7743d1eb40
+U mistachkin
+Z b7e0b8af3a354ae18e5de2ce26dd905f

diff --git a/manifest.uuid b/manifest.uuid
index cde3d14b19ca9a01105eccdb79ea8c96c149366a..96016126dcfb6072314f885f579cd97952046f9f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1135ad014aac8a4ae5169375af1b368feaa8331b
\ No newline at end of file
+c7242aa3e9c08e0c019388e89a785a6e59c915d5
\ No newline at end of file