From: mistachkin <mistachkin@noemail.net>
Date: Sat, 14 Oct 2017 19:54:06 +0000 (+0000)
Subject: Updates to the Makefiles for MSVC.
X-Git-Tag: version-3.21.0~9^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=835cd436e1e0a964d84034a88303a1b4c0e8083c;p=thirdparty%2Fsqlite.git

Updates to the Makefiles for MSVC.

FossilOrigin-Name: ac8786f3f9f35cb6fa72c65f5ca41cc6659f4702cd29ab0c9dcf04d3d1189090
---

diff --git a/Makefile.msc b/Makefile.msc
index ce867ba3f3..2804c25ab4 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1984,8 +1984,8 @@ SHELL_SRC = \
 	$(TOP)\ext\misc\fileio.c \
 	$(TOP)\ext\misc\completion.c
 
-shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
-	$(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl > shell.c
+shell.c:	$(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
+	$(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c
 
 
 # Rules to build the extension objects.
diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index f535d1450a..e0f7ad8615 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -928,6 +928,7 @@ LIBRESOBJS =
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_DBSTAT_VTAB
 !ENDIF
 
 
@@ -957,8 +958,8 @@ sqlite3.def:	Replace.exe $(LIBOBJ)
 		| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
 		| sort >> sqlite3.def
 
-$(SQLITE3EXE):	$(TOP)\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
-	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\shell.c $(SHELL_CORE_SRC) \
+$(SQLITE3EXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
+	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) shell.c $(SHELL_CORE_SRC) \
 		/link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
 
 
diff --git a/manifest b/manifest
index 2599e89765..1ce91e738e 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Improved\sability\sto\sgenerate\sstand-alone\sprogram\susing\sTCL\sand\sSQLite\sby\ncompiling\swith\s-DTCLSH_INIT_PROC=name\sto\scause\sthe\sTCL\sinterpreter\sto\sbe\ninitialized\susing\sprocedure\sname().\s\sBoth\ssqlite3_analyzer\sand\stestfixture\nare\snow\sbuilt\sthis\sway.
-D 2017-10-13T20:14:06.865
+C Updates\sto\sthe\sMakefiles\sfor\sMSVC.
+D 2017-10-14T19:54:06.773
 F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc a341cc7d737f596a1074e47fc9eb17bde689413d891e3ef2f26e98126da950a4
+F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
 F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
 F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 1a47d071e3d5435f8f7ebff7eb6703848bbd65d4
-F autoconf/Makefile.msc 55328895d224f1b81298224929a16b8601baa75f9d7badd493224f68a22700dd
+F autoconf/Makefile.msc 645b8a9774281515dc4a8de65d8a914f7b418ba8bd1c48b53ccbf43d3b339715
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac 2893b823ecc86cea13739f6c8109a41392254d1db08235c5615e0af5722c8578
@@ -1664,7 +1664,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 298a3fddec459c4fd2b840bd363239dc627f1dda90e2d5e478846cb895a8ad82
-R df005e0c0c347d89af378f70d82f057b
-U drh
-Z 8b50e8b5594af446543ab2fc55fee9a2
+P d65d1f297ddb07b799ff5b2e560575fc59a6fa74c752269cc85ab84348fb7da4
+R 49fa7e54acb9ad8a392e6c25fe8116d5
+U mistachkin
+Z 3270bf7f35234fd560a264ffe40cbf35
diff --git a/manifest.uuid b/manifest.uuid
index d905d370b6..63b3b0cf2b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d65d1f297ddb07b799ff5b2e560575fc59a6fa74c752269cc85ab84348fb7da4
\ No newline at end of file
+ac8786f3f9f35cb6fa72c65f5ca41cc6659f4702cd29ab0c9dcf04d3d1189090
\ No newline at end of file