Fix the MSVC makefile so that it works with the unicode61 tokenizer.

FossilOrigin-Name: 480158143be1256cbe4dba52ef1a5b96e172b38c

diff --git a/Makefile.msc b/Makefile.msc
index 2d8f44c7332ca16397b261ea2a2500e99e87960b..d03e9cfd8b19a33b0a9f54ee3fb2f7f36de0948f 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -250,8 +250,9 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
          callback.lo complete.lo ctime.lo date.lo delete.lo \
          expr.lo fault.lo fkey.lo \
-         fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo fts3_porter.lo \
-         fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \
+         fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
+         fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
+         fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
          func.lo global.lo hash.lo \
          icu.lo insert.lo journal.lo legacy.lo loadext.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
@@ -405,6 +406,8 @@ SRC = $(SRC) \
   $(TOP)\ext\fts3\fts3_tokenizer.h \
   $(TOP)\ext\fts3\fts3_tokenizer.c \
   $(TOP)\ext\fts3\fts3_tokenizer1.c \
+  $(TOP)\ext\fts3\fts3_unicode.c \
+  $(TOP)\ext\fts3\fts3_unicode2.c \
   $(TOP)\ext\fts3\fts3_write.c
 SRC = $(SRC) \
   $(TOP)\ext\icu\sqliteicu.h \
@@ -512,6 +515,8 @@ TESTSRC2 = \
   $(TOP)\ext\fts3\fts3_aux.c \
   $(TOP)\ext\fts3\fts3_expr.c \
   $(TOP)\ext\fts3\fts3_tokenizer.c \
+  $(TOP)\ext\fts3\fts3_unicode.c \
+  $(TOP)\ext\fts3\fts3_unicode2.c \
   $(TOP)\ext\fts3\fts3_write.c \
   $(TOP)\ext\async\sqlite3async.c
 
@@ -926,6 +931,12 @@ fts3_tokenizer.lo: $(TOP)\ext\fts3\fts3_tokenizer.c $(HDR) $(EXTHDR)
 fts3_tokenizer1.lo:    $(TOP)\ext\fts3\fts3_tokenizer1.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenizer1.c
 
+fts3_unicode.lo:       $(TOP)\ext\fts3\fts3_unicode.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode.c
+
+fts3_unicode2.lo:      $(TOP)\ext\fts3\fts3_unicode2.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode2.c
+
 fts3_write.lo: $(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_write.c
 

diff --git a/manifest b/manifest
index 190c862922e7c1417fe8a7421c1cee66cc880c28..45aa8d12351a92813575001c3a70a095c2a6bb84 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Updates\sregarding\sURI\squery\sparameters\sand\sshared\scache\sin\sthe\sdocumentation\nderived\sfrom\scomments\sin\ssqlite.h.in.\s\sNo\schanges\sto\scode.
-D 2012-05-28T17:51:53.434
+C Fix\sthe\sMSVC\smakefile\sso\sthat\sit\sworks\swith\sthe\sunicode61\stokenizer.
+D 2012-05-28T20:22:16.462
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
+F Makefile.msc 0891f992d012d6b2976f86e80a82ae6839fa9ded
 F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P b8720d0416b8d4af7d131f1ddc3d280d196a9eda
-R 348c03cfec043fa2accf5b24f56b9e07
+P bcc72d413e8db5fe8b32147ac22d406e2cd6bb60
+R 3124713b2110812cfce2d07ccce3e9e9
 U drh
-Z 4dd2c323458ec95fb0cf85be25b240a2
+Z e96acf301cc5f997fc3e1f3cdf1b6355

diff --git a/manifest.uuid b/manifest.uuid
index a78e9235fbafba7e7f43026917a54c0e6f23910e..21667c78672dbbd116ebcf856bb001e8e7ba55ee 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bcc72d413e8db5fe8b32147ac22d406e2cd6bb60
\ No newline at end of file
+480158143be1256cbe4dba52ef1a5b96e172b38c
\ No newline at end of file