From b1b808b92dddee6d57c661777d9e321c383486d2 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 22 Mar 2019 22:34:16 +0000
Subject: [PATCH] Further enhancements and fixes.

FossilOrigin-Name: c9f1972e10b0cdb5e351a776a64c60acf404dcfbe2a8a28c0a273bbe851e677f
---
 Makefile.msc          | 19 +++++++++----------
 autoconf/Makefile.msc |  5 +++++
 manifest              | 14 +++++++-------
 manifest.uuid         |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 47e7ccc2c7..3512d3e33a 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -860,6 +860,10 @@ RCC = $(RCC) -DSQLITE_WIN32_MALLOC_VALIDATE=1
 # prior to running nmake in order to match the actual installed location and
 # version on this machine.
 #
+!IFNDEF TCLVERSION
+TCLVERSION = 86
+!ENDIF
+
 !IFNDEF TCLDIR
 TCLDIR = $(TOP)\compat\tcl
 !ENDIF
@@ -873,11 +877,11 @@ TCLLIBDIR = $(TCLDIR)\lib
 !ENDIF
 
 !IFNDEF LIBTCL
-LIBTCL = tcl86.lib
+LIBTCL = tcl$(TCLVERSION).lib
 !ENDIF
 
 !IFNDEF LIBTCLSTUB
-LIBTCLSTUB = tclstub86.lib
+LIBTCLSTUB = tclstub$(TCLVERSION).lib
 !ENDIF
 
 !IFNDEF LIBTCLPATH
@@ -1088,20 +1092,15 @@ LTLIBS = $(LTLIBS) rpcrt4.lib
 !IFDEF PLATFORM
 LTLINKOPTS = /NOLOGO /MACHINE:$(PLATFORM)
 LTLIBOPTS = /NOLOGO /MACHINE:$(PLATFORM)
-!ELSE
-!IFDEF VISUALSTUDIOVERSION
-!IF "$(VISUALSTUDIOVERSION)">="12.0"
+!ELSEIF "$(VISUALSTUDIOVERSION)"=="12.0" || \
+        "$(VISUALSTUDIOVERSION)"=="14.0" || \
+        "$(VISUALSTUDIOVERSION)"=="15.0"
 LTLINKOPTS = /NOLOGO /MACHINE:x86
 LTLIBOPTS = /NOLOGO /MACHINE:x86
 !ELSE
 LTLINKOPTS = /NOLOGO
 LTLIBOPTS = /NOLOGO
 !ENDIF
-!ELSE
-LTLINKOPTS = /NOLOGO
-LTLIBOPTS = /NOLOGO
-!ENDIF
-!ENDIF
 
 # When compiling for use in the WinRT environment, the following
 # linker option must be used to mark the executable as runnable
diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index 58492fde5a..df9b96a66a 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -826,6 +826,11 @@ LTLIBS = $(LTLIBS) rpcrt4.lib
 !IFDEF PLATFORM
 LTLINKOPTS = /NOLOGO /MACHINE:$(PLATFORM)
 LTLIBOPTS = /NOLOGO /MACHINE:$(PLATFORM)
+!ELSEIF "$(VISUALSTUDIOVERSION)"=="12.0" || \
+        "$(VISUALSTUDIOVERSION)"=="14.0" || \
+        "$(VISUALSTUDIOVERSION)"=="15.0"
+LTLINKOPTS = /NOLOGO /MACHINE:x86
+LTLIBOPTS = /NOLOGO /MACHINE:x86
 !ELSE
 LTLINKOPTS = /NOLOGO
 LTLIBOPTS = /NOLOGO
diff --git a/manifest b/manifest
index 484a69fbc9..84e8573793 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Attempt\sto\sdetect\swhen\sthe\sMSVC\slinker\srequires\sthe\s/MACHINE\sargument.
-D 2019-03-22T16:52:17.298
+C Further\senhancements\sand\sfixes.
+D 2019-03-22T22:34:16.471
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 236d2739dc3e823c3c909bca2d6cef93009bafbefd7018a8f3281074ecb92954
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc dd141c2646a46b10ccfed9a7a1613dbf206af0dcac0c3b91ffb5cbaa5deb2cfc
+F Makefile.msc 99300aed858a1e229f32bec9fe1a2d060bacb722210c357aae02dd9187b0d80a
 F README.md ebcdb6d5656020ef5ca37a6fc1ad89b4c80560ea33a3d70c250f9b845cf9da62
 F VERSION 288d756b1b7be03ecdbf1795c23af2c8425f2e46ba6979a14ef53360308f080d
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -15,7 +15,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am e14b629addaa1ce372b72043f28f40de2e32b7e211b6e0fc18dbb87989197e40
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.msc 32c31aa15f9f3263e2a62b1cd2e1a09074c6ca56f56ba64017323ebac3d8c1b2
+F autoconf/Makefile.msc bea737cb2ed8802056ff44947c4963026307caff4d7382b9622e7928990a4a18
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac 308de24343e76ecfbe9a67f8fcd4c5216b790d230c5d9ce10210b7d5965d6192
@@ -1807,7 +1807,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 ecbae90aef63ed6d07d474416900db36ff6dd9c2ed1bbb5f4d883b6838156be1
-R 6760bb8a25a16330268b7b4bc7253c8b
+P 3e355846217785c30f518d31a5541172c4213c0d8559c3f8638a047cd745c98e
+R f514b3cc5178f3c9a91cbdbef1da8a79
 U mistachkin
-Z 223ac1a94817effaa94f71092252d26d
+Z 2d1b462418ad87af5ba30cb65e03d4e4
diff --git a/manifest.uuid b/manifest.uuid
index b41b27b5ff..a865eaed88 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3e355846217785c30f518d31a5541172c4213c0d8559c3f8638a047cd745c98e
\ No newline at end of file
+c9f1972e10b0cdb5e351a776a64c60acf404dcfbe2a8a28c0a273bbe851e677f
\ No newline at end of file