From: mistachkin <mistachkin@noemail.net>
Date: Fri, 5 Jan 2018 16:05:51 +0000 (+0000)
Subject: In the Makefile for MSVC, only attempt to link against Tcl when it is needed.  Also... 
X-Git-Tag: version-3.22.0~108^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=590522c18e06f6e18910c23e20535b43ac306a64;p=thirdparty%2Fsqlite.git

In the Makefile for MSVC, only attempt to link against Tcl when it is needed.  Also, only compile 'zipfile.c' when use of zlib is enabled.

FossilOrigin-Name: a33ad33cf031edee273afa4735c8564870465be22962a9c277e4ac43a307ff2c
---

diff --git a/Makefile.msc b/Makefile.msc
index 8f0fd1b82d..e2a6bbe86d 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1148,8 +1148,8 @@ LDFLAGS = $(LDOPTS)
 # Start with the Tcl related linker options.
 #
 !IF $(NO_TCL)==0
-LTLIBPATHS = /LIBPATH:$(TCLLIBDIR)
-LTLIBS = $(LTLIBS) $(LIBTCL)
+TCLLIBPATHS = $(TCLLIBPATHS) /LIBPATH:$(TCLLIBDIR)
+TCLLIBS = $(TCLLIBS) $(LIBTCL)
 !ENDIF
 
 # If zlib support is enabled, add the linker options for it.
@@ -1506,8 +1506,13 @@ TESTEXT = \
   $(TOP)\ext\misc\spellfix.c \
   $(TOP)\ext\misc\totype.c \
   $(TOP)\ext\misc\unionvtab.c \
-  $(TOP)\ext\misc\wholenumber.c \
-  $(TOP)\ext\misc\zipfile.c
+  $(TOP)\ext\misc\wholenumber.c
+
+# If use of zlib is enabled, add the "zipfile.c" source file.
+#
+!IF $(USE_ZLIB)!=0
+TESTEXT = $(TESTEXT) $(TOP)\ext\misc\zipfile.c
+!ENDIF
 
 # Source code to the library files needed by the test fixture
 # (non-amalgamation)
@@ -2025,7 +2030,7 @@ tclsqlite-shell.lo:	$(TOP)\src\tclsqlite.c $(HDR) $(SQLITE_TCL_DEP)
 	$(LTCOMPILE) $(NO_WARN) -DTCLSH -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 
 tclsqlite3.exe:	tclsqlite-shell.lo $(SQLITE3C) $(SQLITE3H) $(LIBRESOBJS)
-	$(LTLINK) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite-shell.lo $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
+	$(LTLINK) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS) $(TCLLIBPATHS) $(LTLIBPATHS) /OUT:$@ tclsqlite-shell.lo $(LIBRESOBJS) $(TCLLIBS) $(LTLIBS) $(TLIBS)
 
 # Rules to build opcodes.c and opcodes.h
 #
@@ -2073,8 +2078,13 @@ SHELL_SRC = \
 	$(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)\ext\expert\sqlite3expert.h
+
+# If use of zlib is enabled, add the "zipfile.c" source file.
+#
+!IF $(USE_ZLIB)!=0
+SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\zipfile.c
+!ENDIF
 
 shell.c:	$(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
 	$(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c
@@ -2262,7 +2272,7 @@ testfixture.exe:	$(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR) $(SQLITE_TC
 	$(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
 		-DBUILD_sqlite -I$(TCLINCDIR) \
 		$(TESTFIXTURE_SRC) \
-		/link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
+		/link $(LDFLAGS) $(LTLINKOPTS) $(TCLLIBPATHS) $(LTLIBPATHS) $(LIBRESOBJS) $(TCLLIBS) $(LTLIBS) $(TLIBS)
 
 extensiontest:	testfixture.exe testloadext.dll
 	@set PATH=$(LIBTCLPATH);$(PATH)
@@ -2312,7 +2322,7 @@ sqlite3_analyzer.c:	$(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\s
 
 sqlite3_analyzer.exe:	sqlite3_analyzer.c $(LIBRESOBJS)
 	$(LTLINK) $(NO_WARN) -DBUILD_sqlite -I$(TCLINCDIR) sqlite3_analyzer.c \
-		/link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(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)
diff --git a/manifest b/manifest
index 53a4f9a14e..eb04d9429e 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Add\ssome\smissing\s#ifdefs\sfor\sbuilding\swithout\szlib.
-D 2018-01-05T16:03:52.073
+C In\sthe\sMakefile\sfor\sMSVC,\sonly\sattempt\sto\slink\sagainst\sTcl\swhen\sit\sis\sneeded.\s\sAlso,\sonly\scompile\s'zipfile.c'\swhen\suse\sof\szlib\sis\senabled.
+D 2018-01-05T16:05:51.162
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 1b11037c5ed3399a79433cc82c59b5e36a7b3a3e4e195bb27640d0d2145e03e1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc c4eaeff29b73d76437cf9c13d7a9654fc0e9e2578e20c12d0067c3d510e4e8e4
+F Makefile.msc 72f437d37191eb122ae289f5583af5eb9cae288fbd7914111f029066c84fbc84
 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 364ac333b030f0e3372937df723f1098183da87913ba0e8ae162864ee24a50d3
-R 0ea7c4065b03d537986e987f96237bd2
+P c63fb1700c0f67d90857b1f3859c203880d0939f356a64d8ae7cafc814ea72bf
+R b5c6776760b2ddd7e6d28c4945f67802
 U mistachkin
-Z 7bfc76075fe03643e9086a52bceca2fa
+Z 02b062c480e829873866b47ba5cd168a
diff --git a/manifest.uuid b/manifest.uuid
index cff8285416..8f4fdf47f5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c63fb1700c0f67d90857b1f3859c203880d0939f356a64d8ae7cafc814ea72bf
\ No newline at end of file
+a33ad33cf031edee273afa4735c8564870465be22962a9c277e4ac43a307ff2c
\ No newline at end of file