More work on the MSVC build.

FossilOrigin-Name: a79c46bc61a35edbaf6112c26e8052314b0eb16a

diff --git a/Makefile.msc b/Makefile.msc
index 504b2893ba7ba060521727a0db010c545cf14f69..5921e9375a4d42e56ca74fb23d03de09484cd567 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1948,7 +1948,7 @@ rbu.exe: $(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C) $(SQLITE3H
 
 clean:
        del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL
-       del /Q *.bsc *.cod *.da *.bb *.bbg gmon.out 2>NUL
+       del /Q *.bsc *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL
        del /Q $(SQLITE3C) $(SQLITE3H) opcodes.c opcodes.h 2>NUL
        del /Q lemon.* lempar.c parse.* 2>NUL
        del /Q mkkeywordhash.* keywordhash.h 2>NUL

diff --git a/manifest b/manifest
index ffb98b27349b33361c0e3b8078cd983c1fef20ba..61cf5d66ed776c4887184b15a45f26f6a168727a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C In\sthe\sTCL\sinterface,\sif\sa\sdatabase\sconnection\sobject\swas\sopened\swith\nthe\s-uri\s1\soption,\sthen\salso\shonor\sURI\sfilenames\sfor\sthe\s"backup"\sand\n"restore"\scommands.
-D 2016-01-22T23:17:51.219
+C More\swork\son\sthe\sMSVC\sbuild.
+D 2016-01-23T00:07:51.151
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc bf507c4168b28d0ba47ac29d53fd6244289f10b8
+F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -348,7 +348,7 @@ F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 1db9a902e89201a0ae3ff5243a7a3f37842a3937
 F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
 F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
-F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
+F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 F src/sqliteInt.h 74e10a74116df0aec9d4a3e134f1a86cc34c2f14
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
@@ -1419,7 +1419,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 df22556fd75997111e52f96572da8379dfe948be
-R 14f009751ec343de1132abf0a7bfa01f
-U drh
-Z 3618240e30f243f2df7ae3a3ace24b2d
+P a1c8116ced62d81f3f5ca26bbe0877e829d4cc56
+R b34246fa017fc0ae2e7bf7cb484e3eeb
+U mistachkin
+Z ba075ff448ff99fa520b3503324fe6e9

diff --git a/manifest.uuid b/manifest.uuid
index 5a178d25718a644dc36317fe0fa29fff6b3788ed..d1ea2b33a4e917f3ce85af35a4fc4382d573ddd1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a1c8116ced62d81f3f5ca26bbe0877e829d4cc56
\ No newline at end of file
+a79c46bc61a35edbaf6112c26e8052314b0eb16a
\ No newline at end of file

diff --git a/src/sqlite3.rc b/src/sqlite3.rc
index 04dd0864882a88b7a5ba0342761009d768978f20..5a856490d64a45062c5e8d648e51cc8b6d09dbdc 100644 (file)
--- a/src/sqlite3.rc
+++ b/src/sqlite3.rc
@@ -39,9 +39,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
  * Icon
  */
 
+#if !defined(RC_VERONLY)
 #define IDI_SQLITE 101
 
 IDI_SQLITE ICON "..\\art\\sqlite370.ico"
+#endif /* !defined(RC_VERONLY) */
 
 /*
  * Version