/ Check-in [df22556f]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

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

Overview
Comment:More MSVC makefile cleanup.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: df22556fd75997111e52f96572da8379dfe948be
User & Date: mistachkin 2016-01-22 22:16:50
Context
2016-01-22
23:17
In the TCL interface, if a database connection object was opened with the -uri 1 option, then also honor URI filenames for the "backup" and "restore" commands. check-in: a1c8116c user: drh tags: trunk
22:16
More MSVC makefile cleanup. check-in: df22556f user: mistachkin tags: trunk
19:44
Reenable the xCurrentTime and xGetLastError methods on the unix VFSes as long as SQLITE_OMIT_DEPRECATED is not defined. check-in: c11c85fd user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

  1321   1321   #
  1322   1322   TESTOPTS = --verbose=file --output=test-out.txt
  1323   1323   
  1324   1324   # This is the default Makefile target.  The objects listed here
  1325   1325   # are what get build when you type just "make" with no arguments.
  1326   1326   #
  1327   1327   all:	dll libsqlite3.lib shell libtclsqlite3.lib
         1328  +
         1329  +# Dynamic link library section.
         1330  +#
         1331  +dll: $(SQLITE3DLL)
         1332  +
         1333  +# Shell executable.
         1334  +#
         1335  +shell: $(SQLITE3EXE)
  1328   1336   
  1329   1337   libsqlite3.lib:	$(LIBOBJ)
  1330   1338   	$(LTLIB) $(LTLIBOPTS) /OUT:$@ $(LIBOBJ) $(TLIBS)
  1331   1339   
  1332   1340   libtclsqlite3.lib:	tclsqlite.lo libsqlite3.lib
  1333   1341   	$(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCLSTUB) $(TLIBS)
         1342  +
         1343  +$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
         1344  +	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS) /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
         1345  +
         1346  +sqlite3.def: libsqlite3.lib
         1347  +	echo EXPORTS > sqlite3.def
         1348  +	dumpbin /all libsqlite3.lib \
         1349  +		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3_.*)$$" \1 \
         1350  +		| sort >> sqlite3.def
  1334   1351   
  1335   1352   $(SQLITE3EXE):	$(TOP)\src\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
  1336   1353   	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c $(SHELL_CORE_SRC) \
  1337   1354   		/link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
  1338   1355   
  1339   1356   sqldiff.exe:	$(TOP)\tool\sqldiff.c $(SQLITE3C) $(SQLITE3H)
  1340   1357   	$(LTLINK) $(NO_WARN) $(TOP)\tool\sqldiff.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
................................................................................
  1415   1432   
  1416   1433   opcodes.lo:	opcodes.c
  1417   1434   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c opcodes.c
  1418   1435   
  1419   1436   # Rule to build the Win32 resources object file.
  1420   1437   #
  1421   1438   !IF $(USE_RC)!=0
  1422         -$(LIBRESOBJS):	$(TOP)\src\sqlite3.rc $(HDR)
         1439  +$(LIBRESOBJS):	$(TOP)\src\sqlite3.rc $(SQLITE3H)
  1423   1440   	echo #ifndef SQLITE_RESOURCE_VERSION > sqlite3rc.h
  1424   1441   	for /F %%V in ('type "$(TOP)\VERSION"') do ( \
  1425   1442   		echo #define SQLITE_RESOURCE_VERSION %%V \
  1426   1443   			| $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact . ^, >> sqlite3rc.h \
  1427   1444   	)
  1428   1445   	echo #endif >> sqlite3rc.h
  1429   1446   	$(LTRCOMPILE) -fo $(LIBRESOBJS) $(TOP)\src\sqlite3.rc
................................................................................
  1953   1970   	del /Q sqlite3.c sqlite3-*.c 2>NUL
  1954   1971   	del /Q sqlite3rc.h 2>NUL
  1955   1972   	del /Q shell.c sqlite3ext.h 2>NUL
  1956   1973   	del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL
  1957   1974   	del /Q sqlite-*-output.vsix 2>NUL
  1958   1975   	del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe 2>NUL
  1959   1976   	del /Q fts5.* fts5parse.* 2>NUL
  1960         -
  1961         -# Shell executable.
  1962         -#
  1963         -shell: $(SQLITE3EXE)
  1964         -
  1965         -# Dynamic link library section.
  1966         -#
  1967         -dll: $(SQLITE3DLL)
  1968         -
  1969         -sqlite3.def: libsqlite3.lib
  1970         -	echo EXPORTS > sqlite3.def
  1971         -	dumpbin /all libsqlite3.lib \
  1972         -		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3_.*)$$" \1 \
  1973         -		| sort >> sqlite3.def
  1974         -
  1975         -$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
  1976         -	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS) /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)