Simplify FTS5 handling in the MSVC makefile.

FossilOrigin-Name: f022e04343fc166a71b315d5aabbc5cc075a4767

diff --git a/Makefile.msc b/Makefile.msc
index 262cc95ecc200620339039eea5ebcb15de363756..ec553a742d7c13e1a076e2da6a320af3ff58f73a 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1683,7 +1683,7 @@ fts5parse.c:      $(TOP)\ext\fts5\fts5parse.y lemon.exe
        type fts5parse.c.orig \
                | $(NAWK) "/.*/ { gsub(/yy/,\"fts5yy\");print }" \
                | $(NAWK) "/.*/ { gsub(/YY/,\"fts5YY\");print }" \
-               | $(NAWK) "/.*/ { gsub(/TOKEN/,\"FTS5TOKEN\");print }" >> $@
+               | $(NAWK) "/.*/ { gsub(/TOKEN/,\"FTS5TOKEN\");print }" > $@
 
 fts5parse.h: fts5parse.c
 
@@ -1694,7 +1694,7 @@ fts5.lo:  fts5.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c fts5.c
 
 fts5_ext.lo:   fts5.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) $(NO_WARN) -DSQLITE_ENABLE_FTS5 -c fts5.c
+       $(LTCOMPILE) $(NO_WARN) -c fts5.c
 
 fts5.dll:      fts5_ext.lo
        $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ fts5_ext.lo

diff --git a/manifest b/manifest
index 102e9945d447a991bf4cd7d071f6be6b8ad99815..0c81483a9be5c2b82a3933aa3b5b8dfba9d4711c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\sa\s(harmless)\sshadowed\slocal\svariable\sdefinition\sin\sthe\sintegrity_check\nlogic.
-D 2015-07-02T16:29:56.368
+C Simplify\sFTS5\shandling\sin\sthe\sMSVC\smakefile.
+D 2015-07-02T16:50:43.673
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1f525f24e2d3a4defd0ce819c10980caeec967fe
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 0dd6214eb5a8038e4a4b4a551c55578dbb8e1b56
+F Makefile.msc 704da8dafbe56e3a734262d07003f203a7e490b6
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 251a7590ff4f65f59a1c871892533e4e2c544515
-R 010518bade26bae82e6c430e9e1a14a3
-U drh
-Z c8df00cfe33d3c084bc57e29320bfa5b
+P 3a26a919fd5550e5a0053a48cb93a27bb95cc916
+R 19651ea83adcb4d525e3ac0569c1fb03
+U mistachkin
+Z 09efa0bc8e44f82df4002070e7088d11

diff --git a/manifest.uuid b/manifest.uuid
index fe01ea783eaac879176b949afad955e6df096ad9..6990e76c326310b55dda2660a730b0fca10484cd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3a26a919fd5550e5a0053a48cb93a27bb95cc916
\ No newline at end of file
+f022e04343fc166a71b315d5aabbc5cc075a4767
\ No newline at end of file