More adjustments to MSVC Makefile dependencies for zlib.

FossilOrigin-Name: bb650e5d14642b925c5ea65ba7991b35c4e941405d2557d542b99c66ca4bc130

diff --git a/Makefile.msc b/Makefile.msc
index c9b78b68f84a5be17f0e703e03ae385ea1e4f469..f1d43c22c4b741c5b77ba7b166727abfcf4442d6 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -636,10 +636,11 @@ SHELL_CORE_DEP =
 !ENDIF
 
 # <<mark>>
-# If zlib support is enabled, add the shell dependency for it.
+# If zlib support is enabled, add the dependencies for it.
 #
 !IF $(USE_ZLIB)!=0 && $(BUILD_ZLIB)!=0
 SHELL_CORE_DEP = zlib $(SHELL_CORE_DEP)
+TESTFIXTURE_DEP = zlib $(TESTFIXTURE_DEP)
 !ENDIF
 # <</mark>>
 
@@ -2076,15 +2077,14 @@ SHELL_SRC = \
        $(TOP)\ext\misc\shathree.c \
        $(TOP)\ext\misc\fileio.c \
        $(TOP)\ext\misc\completion.c \
-       $(TOP)\ext\misc\sqlar.c \
        $(TOP)\ext\expert\sqlite3expert.c \
        $(TOP)\ext\expert\sqlite3expert.h \
-       $(TOP)\ext\misc\zipfile.c \
-        $(TOP)\src\test_windirent.c
+       $(TOP)\src\test_windirent.c
 
 # If use of zlib is enabled, add the "zipfile.c" source file.
 #
 !IF $(USE_ZLIB)!=0
+SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\sqlar.c
 SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\zipfile.c
 !ENDIF
 
@@ -2270,7 +2270,7 @@ sqlite_tcl.h:
                | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "Tcl_HashEntry *(*createProc)" "Tcl_HashEntry *(SQLITE_TCLAPI *createProc)" >> $(SQLITETCLH)
 !ENDIF
 
-testfixture.exe:       $(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR) $(SQLITE_TCL_DEP)
+testfixture.exe:       $(TESTFIXTURE_SRC) $(TESTFIXTURE_DEP) $(SQLITE3H) $(LIBRESOBJS) $(HDR) $(SQLITE_TCL_DEP)
        $(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
                -DBUILD_sqlite -I$(TCLINCDIR) \
                $(TESTFIXTURE_SRC) \

diff --git a/manifest b/manifest
index fd16cab1073a3f9e45dcaa67cbd2d42719faf829..bc639547e1579d62e8e959b08134f804fdbba819 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Fix\scompiler\swarnings.
-D 2018-01-05T17:10:49.665
+C More\sadjustments\sto\sMSVC\sMakefile\sdependencies\sfor\szlib.
+D 2018-01-05T17:12:13.607
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in f5c6285ac43b2e567d6cf463dff3744da960a19f2cf141744b4472842a97681e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 69711303f4062857b1f07ecfe74d7952ce56e7401ed0248eea0569fd63b7f664
+F Makefile.msc de37dcd0e875a72b3e4f0d5d962df007e7fffbdebcf588547aa9a414dc690dbc
 F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681
 F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1694,7 +1694,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 45495d3e256fef4d0669754726878ed17248fc781397ebb0421149ee9492f977
-R fdf4e94235537d819e1c48759efffe29
+P 19aabccfe34c956599f33cd3ddc846816adc06784c2496838f1ef53059e038e5
+R 4f7a61feaaf912b14f8d84b71ecd0523
 U mistachkin
-Z 11d1a9bb2052215696c761adb1621865
+Z 232e8c03263ea4c4f59899620c8c44c4

diff --git a/manifest.uuid b/manifest.uuid
index 23f6ac3e69441e59449c2a3e75fa4fd603c16d0f..4cf798be0be2378725b8d491745ae8a9bf50b2e6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-19aabccfe34c956599f33cd3ddc846816adc06784c2496838f1ef53059e038e5
\ No newline at end of file
+bb650e5d14642b925c5ea65ba7991b35c4e941405d2557d542b99c66ca4bc130
\ No newline at end of file