/ Check-in [7c610276]
Login

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

Overview
Comment:Treat compilation of FTS5 for the loadable extension specially with MSVC.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7c610276bb41dbc80fe169d35fe9a3a3f6525635
User & Date: mistachkin 2015-06-26 20:45:43
Context
2015-06-27
03:58
Add the Mempage.aDataOfst field and use it in sqlite3BtreeMovetoUnpacked() for about a 2 million cycle gain. check-in: bee94dc3 user: drh tags: trunk
2015-06-26
20:45
Treat compilation of FTS5 for the loadable extension specially with MSVC. check-in: 7c610276 user: mistachkin tags: trunk
20:25
Merge fts5 branch into trunk. check-in: d27d9965 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

  1689   1689   
  1690   1690   fts5parse.h: fts5parse.c
  1691   1691   
  1692   1692   fts5.c: $(FTS5_SRC)
  1693   1693   	$(TCLSH_CMD) $(TOP)\ext\fts5\tool\mkfts5c.tcl
  1694   1694   
  1695   1695   fts5.lo:	fts5.c $(HDR) $(EXTHDR)
         1696  +	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c fts5.c
         1697  +
         1698  +fts5_ext.lo:	fts5.c $(HDR) $(EXTHDR)
  1696   1699   	$(LTCOMPILE) $(NO_WARN) -DSQLITE_ENABLE_FTS5 -c fts5.c
  1697   1700   
  1698         -fts5.dll:	fts5.lo
  1699         -	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ fts5.lo
         1701  +fts5.dll:	fts5_ext.lo
         1702  +	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ fts5_ext.lo
  1700   1703   
  1701   1704   # Rules to build the 'testfixture' application.
  1702   1705   #
  1703   1706   # If using the amalgamation, use sqlite3.c directly to build the test
  1704   1707   # fixture.  Otherwise link against libsqlite3.lib.  (This distinction is
  1705   1708   # necessary because the test fixture requires non-API symbols which are
  1706   1709   # hidden when the library is built via the amalgamation).