More changes to support MSVC 18.

FossilOrigin-Name: 29c458e2c21f7c8db727fe8dbd4d154918b53a4e

diff --git a/Makefile.msc b/Makefile.msc
index 206f1680d491397354d3bc3af03960a6667d38d9..95dc01cb6944d59701467e9b445882f807c492c6 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -445,6 +445,15 @@ LTLIBOPTS = /MACHINE:$(PLATFORM)
 #
 !IF $(FOR_WINRT)!=0
 LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
+!IF $(_MSC_VER)==1800
+!IF "$(PLATFORM)"=="x86"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store"
+!ELSEIF "$(PLATFORM)"=="x64"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\amd64"
+!ELSEIF "$(PLATFORM)"=="arm"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\arm"
+!ENDIF
+!ENDIF
 !ENDIF
 
 # If either debugging or symbols are enabled, enable PDBs.

diff --git a/manifest b/manifest
index dd4ae69898d9e68683a1d9d0652fda6f35ba853e..1685f222b7c4e731bb578494054376511b65dff4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Update\scomments\sand\spackage\sflavor\serror\smessage.
-D 2013-06-21T07:54:39.197
+C More\schanges\sto\ssupport\sMSVC\s18.
+D 2013-07-10T19:39:02.664
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
+F Makefile.msc 751c3d495c159a15e46a35e523e02f5ae1dffeeb
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P ce5a8cc1cf663546ebdce08bef7d957ed4d341c6
-R 94b717d64d889391ffc6225632038588
+P 9d1b96182af08a73de9dd0327965b96a6d48ac11
+R dce12cbb8dc011a7157a4fc9c756a0b9
 U mistachkin
-Z 99783f3b22c024a372aa90c126538916
+Z b25307feb6067015ecfaf839e3826c1b

diff --git a/manifest.uuid b/manifest.uuid
index 64464643dda9aa96e30e1df5b193715f85db31e6..d8a4992d7496899925f7441c9bd235446f52c167 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d1b96182af08a73de9dd0327965b96a6d48ac11
\ No newline at end of file
+29c458e2c21f7c8db727fe8dbd4d154918b53a4e
\ No newline at end of file