From: mistachkin <mistachkin@noemail.net>
Date: Wed, 6 Apr 2016 17:32:23 +0000 (+0000)
Subject: Add a couple options to the MSVC makefile.
X-Git-Tag: version-3.12.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ae5530f63871d1ac650ba651df848c6219d0200;p=thirdparty%2Fsqlite.git

Add a couple options to the MSVC makefile.

FossilOrigin-Name: ea4de04d67aea5102fc640833cd0ec494990c109
---

diff --git a/Makefile.msc b/Makefile.msc
index 15fbf6c65d..6db8537cee 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -271,6 +271,8 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 #
 !IFNDEF EXT_FEATURE_FLAGS
 !IF $(FOR_WIN10)!=0
+EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_ENABLE_STAT4=1
+EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
 EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4=1
 EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_SYSTEM_MALLOC=1
 EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_OMIT_LOCALTIME=1
diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index ad829bffa0..d01cea9f3f 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -256,6 +256,8 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 #
 !IFNDEF EXT_FEATURE_FLAGS
 !IF $(FOR_WIN10)!=0
+EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_ENABLE_STAT4=1
+EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
 EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4=1
 EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_SYSTEM_MALLOC=1
 EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_OMIT_LOCALTIME=1
diff --git a/manifest b/manifest
index 769e820b33..d1f84240fe 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Version\s3.12.0
-D 2016-03-29T10:14:15.762
+C Add\sa\scouple\soptions\sto\sthe\sMSVC\smakefile.
+D 2016-04-06T17:32:23.768
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
+F Makefile.msc b00bcf0ec7001857aea81ee39fae45d20f5f4e59
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 42f7eb1fb2b06ddd6c6adab3e4388cc0a237ba40
-F autoconf/Makefile.msc b8ada5177e6f39c126a88295af5ad0255e08d280
+F autoconf/Makefile.msc 831e7d9c4e5fb3c1e2686465af2193904bcaf892
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac d807b567f73a2b0986ccdd206b782cecb4d08fff
@@ -1459,10 +1459,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f6a88cccbc0c62a0b453f4711298c9d5e1882b18
-R 345c74a0cb9568a53ff6b8825c4a812b
-T +bgcolor * #d0c0ff
-T +sym-relaese *
-T +sym-version-3.12.0 *
-U drh
-Z 9c957a50c25c5de44ce9010b47906f30
+P e9bb4cf40f4971974a74468ef922bdee481c988b
+R df37ee2a76161156de26d87e281cecd3
+T *branch * branch-3.12.0
+T *sym-branch-3.12.0 *
+T -sym-trunk *
+U mistachkin
+Z 6c1198e706bb6e69068eb7abaf257f68
diff --git a/manifest.uuid b/manifest.uuid
index 21845f2bab..c9e5c2c232 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e9bb4cf40f4971974a74468ef922bdee481c988b
\ No newline at end of file
+ea4de04d67aea5102fc640833cd0ec494990c109
\ No newline at end of file