/ Check-in [bb650e5d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:More adjustments to MSVC Makefile dependencies for zlib.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sqlar-shell-support
Files: files | file ages | folders
SHA3-256: bb650e5d14642b925c5ea65ba7991b35c4e941405d2557d542b99c66ca4bc130
User & Date: mistachkin 2018-01-05 17:12:13
Context
2018-01-05
17:40
In the Makefile for MSVC, the default target should not include binaries that link against the Tcl library. check-in: 5c6d0a1d user: mistachkin tags: sqlar-shell-support
17:12
More adjustments to MSVC Makefile dependencies for zlib. check-in: bb650e5d user: mistachkin tags: sqlar-shell-support
17:10
Fix compiler warnings. check-in: 19aabccf user: mistachkin tags: sqlar-shell-support
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   632    632   SHELL_CORE_DEP = $(SQLITE3DLL)
   633    633   !ELSE
   634    634   SHELL_CORE_DEP =
   635    635   !ENDIF
   636    636   !ENDIF
   637    637   
   638    638   # <<mark>>
   639         -# If zlib support is enabled, add the shell dependency for it.
          639  +# If zlib support is enabled, add the dependencies for it.
   640    640   #
   641    641   !IF $(USE_ZLIB)!=0 && $(BUILD_ZLIB)!=0
   642    642   SHELL_CORE_DEP = zlib $(SHELL_CORE_DEP)
          643  +TESTFIXTURE_DEP = zlib $(TESTFIXTURE_DEP)
   643    644   !ENDIF
   644    645   # <</mark>>
   645    646   
   646    647   # This is the core library that the shell executable should link with.
   647    648   #
   648    649   !IFNDEF SHELL_CORE_LIB
   649    650   !IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
................................................................................
  2072   2073   
  2073   2074   # Source files that go into making shell.c
  2074   2075   SHELL_SRC = \
  2075   2076   	$(TOP)\src\shell.c.in \
  2076   2077   	$(TOP)\ext\misc\shathree.c \
  2077   2078   	$(TOP)\ext\misc\fileio.c \
  2078   2079   	$(TOP)\ext\misc\completion.c \
  2079         -	$(TOP)\ext\misc\sqlar.c \
  2080   2080   	$(TOP)\ext\expert\sqlite3expert.c \
  2081   2081   	$(TOP)\ext\expert\sqlite3expert.h \
  2082         -	$(TOP)\ext\misc\zipfile.c \
  2083         -        $(TOP)\src\test_windirent.c
         2082  +	$(TOP)\src\test_windirent.c
  2084   2083   
  2085   2084   # If use of zlib is enabled, add the "zipfile.c" source file.
  2086   2085   #
  2087   2086   !IF $(USE_ZLIB)!=0
         2087  +SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\sqlar.c
  2088   2088   SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\zipfile.c
  2089   2089   !ENDIF
  2090   2090   
  2091   2091   shell.c:	$(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
  2092   2092   	$(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c
  2093   2093   
  2094   2094   zlib:
................................................................................
  2266   2266   	type "$(TCLINCDIR)\tcl.h" | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact tclDecls.h sqlite_tclDecls.h \
  2267   2267   		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "typedef (.*?)\(Tcl_" "typedef \1 (SQLITE_TCLAPI Tcl_" \
  2268   2268   		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "void (*freeProc)" "void (SQLITE_TCLAPI *freeProc)" \
  2269   2269   		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "Tcl_HashEntry *(*findProc)" "Tcl_HashEntry *(SQLITE_TCLAPI *findProc)" \
  2270   2270   		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "Tcl_HashEntry *(*createProc)" "Tcl_HashEntry *(SQLITE_TCLAPI *createProc)" >> $(SQLITETCLH)
  2271   2271   !ENDIF
  2272   2272   
  2273         -testfixture.exe:	$(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR) $(SQLITE_TCL_DEP)
         2273  +testfixture.exe:	$(TESTFIXTURE_SRC) $(TESTFIXTURE_DEP) $(SQLITE3H) $(LIBRESOBJS) $(HDR) $(SQLITE_TCL_DEP)
  2274   2274   	$(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
  2275   2275   		-DBUILD_sqlite -I$(TCLINCDIR) \
  2276   2276   		$(TESTFIXTURE_SRC) \
  2277   2277   		/link $(LDFLAGS) $(LTLINKOPTS) $(TCLLIBPATHS) $(LTLIBPATHS) $(LIBRESOBJS) $(TCLLIBS) $(LTLIBS) $(TLIBS)
  2278   2278   
  2279   2279   extensiontest:	testfixture.exe testloadext.dll
  2280   2280   	@set PATH=$(LIBTCLPATH);$(PATH)