For MSVC, simplify default locations for Tcl and ICU by using directories inside...

FossilOrigin-Name: 8155b5ac850327ea76aba2adf624132f3e05024c973afd218b12f186fc7630e8

diff --git a/Makefile.msc b/Makefile.msc
index e924db395af9c3cf8d04689e838d3f91108ebe23..c40d195404ee310f29cdc0a351ec3c6984de90fb 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -92,6 +92,15 @@ SPLIT_AMALGAMATION = 0
 !ENDIF
 
 # <<mark>>
+# Set this non-0 to have this makefile assume the Tcl shell executable
+# (tclsh*.exe) is available in the PATH.  By default, this is enabled
+# for compatibility with older build environments.  This setting only
+# applies if TCLSH_CMD is not set manually.
+#
+!IFNDEF USE_TCLSH_IN_PATH
+USE_TCLSH_IN_PATH = 1
+!ENDIF
+
 # Set this non-0 to use zlib, possibly compiling it from source code.
 #
 !IFNDEF USE_ZLIB
@@ -825,7 +834,7 @@ RCC = $(RCC) -DSQLITE_WIN32_MALLOC_VALIDATE=1
 # version on this machine.
 #
 !IFNDEF TCLDIR
-TCLDIR = c:\tcl
+TCLDIR = $(TOP)\compat\tcl
 !ENDIF
 
 !IFNDEF TCLINCDIR
@@ -879,7 +888,7 @@ ZLIBLIB = zlib.lib
 # this machine.
 #
 !IFNDEF ICUDIR
-ICUDIR = C:\icu
+ICUDIR = $(TOP)\compat\icu
 !ENDIF
 
 !IFNDEF ICUINCDIR
@@ -900,7 +909,11 @@ LIBICU = icuuc.lib icuin.lib
 # specific Tcl shell to use.
 #
 !IFNDEF TCLSH_CMD
+!IF $(USE_TCLSH_IN_PATH)!=0
 TCLSH_CMD = tclsh
+!ELSE
+TCLSH_CMD = $(TCLDIR)\bin\tclsh.exe
+!ENDIF
 !ENDIF
 # <</mark>>
 

diff --git a/manifest b/manifest
index f406bec75d6baeef98593c9d28d9d6e4cfa15e20..3e24dc86b3ea26f39da73173271d7f1bd1ee8636 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Add\ssupport\sfor\sincluding\szlib\sin\sthe\sshell\swhen\scompiling\swith\sMSVC.
-D 2017-12-05T18:54:12.861
+C For\sMSVC,\ssimplify\sdefault\slocations\sfor\sTcl\sand\sICU\sby\susing\sdirectories\sinside\s'compat'.
+D 2017-12-05T19:07:30.651
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 2cc781176ca1a58bfb7c2741a192726e2f08db0b473daba3d6c3388d44698470
+F Makefile.msc 2eb985916ed36fb4ba73033d030090fbf22d4d972e06caee19e7d89fb305a8ab
 F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
 F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1681,7 +1681,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 0296286a9963bbaab60ee30d8700703f5ccb382380c9bfc0eb12c4bcb6f2accd
-R 8fbbfa59bd11832619e2c9584cf54899
+P e1838cee3847301ef491467dc75d9c4e1e3b12599596c058bdb14319a52fd8a0
+R a792968384e617f4a37df83169716b24
 U mistachkin
-Z 4e0794167698ff60a9b30c96ee6b24e0
+Z 06008f15f266edb3571035a6d698db2a

diff --git a/manifest.uuid b/manifest.uuid
index c2f98dfc4d001b1cc63acdf77f16785ea3dd1592..b50deeb9bca3a720be2de72eeb687ccc0c757645 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1838cee3847301ef491467dc75d9c4e1e3b12599596c058bdb14319a52fd8a0
\ No newline at end of file
+8155b5ac850327ea76aba2adf624132f3e05024c973afd218b12f186fc7630e8
\ No newline at end of file