Minor adjustments to the MSVC makefile.

FossilOrigin-Name: e2cba1bbfdcb24e35b2275e29071d8a4e4943417

diff --git a/Makefile.msc b/Makefile.msc
index 0eb660adc71851eab86ba72df9c9b66fc4ae2b8e..728154737b5ebd13bb56ae758f751738227997e8 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1714,8 +1714,8 @@ fts5_ext.lo:      fts5.c $(HDR) $(EXTHDR)
 fts5.dll:      fts5_ext.lo
        $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ fts5_ext.lo
 
-sqlite3rbu.lo: $(TOP)/ext/rbu/sqlite3rbu.c $(HDR) $(EXTHDR)
-       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rbu/sqlite3rbu.c
+sqlite3rbu.lo: $(TOP)\ext\rbu\sqlite3rbu.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\rbu\sqlite3rbu.c
 
 # Rules to build the 'testfixture' application.
 #
@@ -1840,8 +1840,8 @@ speedtest1.exe:   $(TOP)\test\speedtest1.c $(SQLITE3C)
                $(TOP)\test\speedtest1.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
 
 rbu.exe: $(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C)
-       $(LTLINK) $(NO_WARN) -I. -DSQLITE_ENABLE_RBU -Fe$@ $(TOP)\ext\rbu\rbu.c $(SQLITE3C) \
-               $(LDFLAGS) $(LTLINKOPTS)
+       $(LTLINK) $(NO_WARN) -DSQLITE_ENABLE_RBU -Fe$@ $(TOP)\ext\rbu\rbu.c $(SQLITE3C) \
+               /link $(LDFLAGS) $(LTLINKOPTS)
 
 clean:
        del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL

diff --git a/manifest b/manifest
index 1354db7a40cdc0da16e48becf6754e4acb76e67d..199dfc584f479d9854816950b0fe3b579d8ed257 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Yet\sanother\schange\sto\sFTS5\strying\sto\sget\sit\sto\smerge\ssuccessfully\sinto\ssessions.
-D 2016-01-14T14:33:36.733
+C Minor\sadjustments\sto\sthe\sMSVC\smakefile.
+D 2016-01-14T18:01:16.348
 F Makefile.in cfa1ac03c4b414992fd53f24d978b45b0c21de55
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 1dc36cfd3c047c9685e539257e158485f16ef035
+F Makefile.msc 2d8b2ad5a03315940bcb9e64145ab70850d66b4d
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1412,7 +1412,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f791fc7009d68941c60d7bf953bab19d86112133
-R 52083946c40dd4f44744cbc0b447540f
-U drh
-Z 9b36451b3b0b6d81cfd6f7c438e3b3aa
+P 8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
+R ed5fce327e310c7f92985b6ea8c3a0f4
+U mistachkin
+Z a106ef292e4f8d6ed0328b1e83183a0f

diff --git a/manifest.uuid b/manifest.uuid
index 92616336dff511057125335ec56ea458a299bffa..754bc8aa98e7c495ab79c348037a1a2ba7e65329 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
\ No newline at end of file
+e2cba1bbfdcb24e35b2275e29071d8a4e4943417
\ No newline at end of file