Minor tweaks to the Makefile for MSVC.

FossilOrigin-Name: 2f6cc5d8a0d9d961d1daf46e8725f7373f740afa788cf99ede9689f49d3a54ec

diff --git a/Makefile.msc b/Makefile.msc
index feab1b0a40a043e2f5579dd4d8f5fb872edf6686..88a0a23a4d39ebb7e5b2ea368cd7dff83c1ab30c 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2340,8 +2340,7 @@ sqltclsh.c: sqlite3.c $(TOP)\src\tclsqlite.c $(TOP)\tool\sqltclsh.tcl $(TOP)\ext
 
 sqltclsh.exe: sqltclsh.c
        $(LTLINK) $(NO_WARN) -DBUILD_sqlite -I$(TCLINCDIR) sqltclsh.c \
-               /link $(LDFLAGS) $(LTLINKOPTS) $(TCLLIBPATHS) $(LTLIBPATHS) $(LIBRESOBJS) $(TCLLIBS) $(LTLIBS) $(TLIBS)
-
+               /link $(LDFLAGS) $(LTLINKOPTS) $(TCLLIBPATHS) $(LTLIBPATHS) $(LIBRESOBJS) $(TCLLIBS) $(LTLIBS) $(TLIBS)
 
 sqlite3_expert.exe: $(SQLITE3C) $(TOP)\ext\expert\sqlite3expert.h $(TOP)\ext\expert\sqlite3expert.c $(TOP)\ext\expert\expert.c
        $(LTLINK) $(NO_WARN)    $(TOP)\ext\expert\sqlite3expert.c $(TOP)\ext\expert\expert.c $(SQLITE3C) $(TLIBS)
@@ -2462,6 +2461,7 @@ clean:
        del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL
        del /Q sqlite-*-output.vsix 2>NUL
        del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe dbhash.exe 2>NUL
+       del /Q sqltclsh.exe 2>NUL
        del /Q fts5.* fts5parse.* 2>NUL
        del /Q lsm.h lsm1.c 2>NUL
 # <</mark>>

diff --git a/manifest b/manifest
index 5b51a6293556e64703f7c0d6c82860ac936b33d4..e01a917ad128f9504356bc92aaa86ad70c4d9839 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Add\sthe\sappendvfs\sextension\sand\scode\sfor\sthe\ssqltclsh.exe\sexecutable.
-D 2018-01-06T13:42:27.074
+C Minor\stweaks\sto\sthe\sMakefile\sfor\sMSVC.
+D 2018-01-06T14:43:33.919
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 9536f61ce33172d4868707ecc10844a0abef9e2e775ad2434245a60406fd7e38
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc b85c373ee4d962cb52beddda3bc78d289a768f8ca8bd3d68eea8eadf6dd04d43
+F Makefile.msc 50cadb65af908a048a5624330782a91bc831a79da19ba17dcf7d273739191413
 F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681
 F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1697,8 +1697,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 656fb5aab32f40412389e43de209867cedee1589533949cc8c01ba24218ea434 46b341e3ad11b807ae50f001b970299de7ea0d523dbb639ee10f1d5aca5d958b
-R 554a8f967a9f4add06a7ff77d66966de
-T +closed 46b341e3ad11b807ae50f001b970299de7ea0d523dbb639ee10f1d5aca5d958b
-U drh
-Z 85cb71c6d2228eace4706c2b9c3e1fa8
+P b0a43e325c53ec0df50fd41acffbbee65eac47b9318868e6959cd39da66fa8d6
+R c768913b6d54732f0058c9759aabde34
+U mistachkin
+Z a162015bb17d305104612ae9f13f8b23

diff --git a/manifest.uuid b/manifest.uuid
index 06963ea079e0dadd20ae699d1577788f4a48f0c6..588573c2f46a54d95bf0520b443cebb989873d98 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0a43e325c53ec0df50fd41acffbbee65eac47b9318868e6959cd39da66fa8d6
\ No newline at end of file
+2f6cc5d8a0d9d961d1daf46e8725f7373f740afa788cf99ede9689f49d3a54ec
\ No newline at end of file