From: mistachkin <mistachkin@noemail.net>
Date: Mon, 29 Jul 2013 19:03:20 +0000 (+0000)
Subject: For the MSVC makefile, recompile vdbe.lo and parse.lo first.
X-Git-Tag: version-3.8.0~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f67feefffcb6a5e23290184bfa1ccbfc0b839d4f;p=thirdparty%2Fsqlite.git

For the MSVC makefile, recompile vdbe.lo and parse.lo first.

FossilOrigin-Name: 9e819f0f12b6f2a8e0e7a90251b3115ff1595f25
---

diff --git a/Makefile.msc b/Makefile.msc
index dd75e0dac7..23c5b17f08 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -472,7 +472,7 @@ NAWK = gawk.exe
 
 # Object files for the SQLite library (non-amalgamation).
 #
-LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
+LIBOBJS0 = vdbe.lo parse.lo 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 \
@@ -485,11 +485,11 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          memjournal.lo \
          mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
          notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
-         pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
+         pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
          random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
          table.lo tokenize.lo trigger.lo \
          update.lo util.lo vacuum.lo \
-         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
+         vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
          vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
 
 # Object files for the amalgamation.
diff --git a/manifest b/manifest
index 7ff295a15b..da5f889018 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Comment\sand\spreprocessor\smacro\scleanup.
-D 2013-07-29T15:54:06.213
+C For\sthe\sMSVC\smakefile,\srecompile\svdbe.lo\sand\sparse.lo\sfirst.
+D 2013-07-29T19:03:20.408
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 1edbab21c991eea719e5abb8067868b63268a371
+F Makefile.msc e9f41f89111627baaabd95cab4988b8d1c3e47c9
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
@@ -1103,7 +1103,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P a94a66d10f160ee79fffa8527655c2cc4a0c7103
-R 40bf3454255194f171fc87e9079822c4
-U drh
-Z 077c159fd8ed6b7ef4b9adb97eba8746
+P c0809b5e32c2ca0600098447a573e718eaeb319f
+R acca2317d80cadebf01ca0291e013836
+U mistachkin
+Z 6eb4dac3f80be1a20108b92a7b5da831
diff --git a/manifest.uuid b/manifest.uuid
index a931d8409b..a579d0511b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c0809b5e32c2ca0600098447a573e718eaeb319f
\ No newline at end of file
+9e819f0f12b6f2a8e0e7a90251b3115ff1595f25
\ No newline at end of file