More updates to the README.

FossilOrigin-Name: 9f02868df71d902a2b9118d0b06df18ee92b666b

diff --git a/autoconf/README.txt b/autoconf/README.txt
index 575e0a8dd8d0ed70932fe15d3e792768eb3bba72..a581c39dea247af070c131b76640000baf6d225e 100644 (file)
--- a/autoconf/README.txt
+++ b/autoconf/README.txt
@@ -4,8 +4,10 @@ This package contains:
  * the shell.c file used to build the sqlite3 shell too, and
  * the sqlite3.h and sqlite3ext.h header files required to link programs
    and sqlite extensions against the installed libary.
- * autoconf/automake installation infrastucture for building on posix systems.
- * a Makefile.msc and sqlite3.rc for building with Microsoft Visual C++
+ * autoconf/automake installation infrastucture for building on POSIX
+   compliant systems.
+ * a Makefile.msc and sqlite3.rc for building with Microsoft Visual C++ on
+   Windows.
 
 BUILDING ON POSIX
 =================
@@ -19,7 +21,7 @@ The following SQLite specific boolean options are supported:
   --enable-threadsafe         build a thread-safe library  [default=yes]
   --enable-dynamic-extensions support loadable extensions  [default=yes]
 
-The default value for the CFLAGS variable (options passed to the C 
+The default value for the CFLAGS variable (options passed to the C
 compiler) includes debugging symbols in the build, resulting in larger
 binaries than are necessary. Override it on the configure command
 line like this:
@@ -34,9 +36,72 @@ example:
   $ CFLAGS="-Os -DSQLITE_OMIT_TRIGGERS" ./configure
 
 
-BUILDING WITH MICROSOFT VISUAL C++:
-===================================
+BUILDING WITH MICROSOFT VISUAL C++
+==================================
 
 To compile for Windows using Microsoft Visual C++:
 
-  $ nmake /f Makefile.msc FOR_WIN10=1
+  $ nmake /f Makefile.msc
+
+Using Microsoft Visual C++ 2005 (or later) is recommended.  Several Windows
+platform variants may be built by adding additional macros to the NMAKE
+command line.
+
+BUILDING FOR WINRT 8.0
+----------------------
+
+  FOR_WINRT=1
+
+Using Microsoft Visual C++ 2012 (or later) is required.  When using the
+above, something like the following macro will need to be added to the
+NMAKE command line as well:
+
+  "NSDKLIBPATH=%WindowsSdkDir%\..\8.0\lib\win8\um\x86"
+
+BUILDING FOR WINRT 8.1
+----------------------
+
+  FOR_WINRT=1
+
+Using Microsoft Visual C++ 2013 (or later) is required.  When using the
+above, something like the following macro will need to be added to the
+NMAKE command line as well:
+
+  "NSDKLIBPATH=%WindowsSdkDir%\..\8.1\lib\winv6.3\um\x86"
+
+BUILDING FOR UAP 10.0
+---------------------
+
+  FOR_WINRT=1 FOR_UAP=1
+
+Using Microsoft Visual C++ 2015 (or later) is required.  When using the
+above, something like the following macros will need to be added to the
+NMAKE command line as well:
+
+  "NSDKLIBPATH=%WindowsSdkDir%\..\10\lib\10.0.10586.0\um\x86"
+  "PSDKLIBPATH=%WindowsSdkDir%\..\10\lib\10.0.10586.0\um\x86"
+  "NUCRTLIBPATH=%UniversalCRTSdkDir%\..\10\lib\10.0.10586.0\ucrt\x86"
+
+BUILDING FOR THE WINDOWS 10 SDK
+-------------------------------
+
+  FOR_WIN10=1
+
+Using Microsoft Visual C++ 2015 (or later) is required.  When using the
+above, no other macros should be needed on the NMAKE command line.
+
+USING PREPROCESSOR DEFINES
+--------------------------
+
+Additionally, preprocessor defines may be specified by using the OPTS macro
+on the NMAKE command line.  However, not all possible preprocessor defines
+may be specified in this manner as some require the amalgamation to be built
+with them enabled (see http://www.sqlite.org/compile.html). For example, the
+following will work:
+
+  "OPTS=-DSQLITE_ENABLE_STAT4=1 -DSQLITE_ENABLE_JSON1=1"
+
+However, the following will not compile unless the amalgamation was built
+with it enabled:
+
+  "OPTS=-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1"

diff --git a/manifest b/manifest
index e41fae053eef14fe2a6bc5e5f3b1d24c47d2f2f6..0f3e8b7b8d6516c9c7280b606d292e996d5e601d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\sautoconf\sREADME\sfile.
-D 2016-01-23T20:43:48.995
+C More\supdates\sto\sthe\sREADME.
+D 2016-01-23T21:57:46.170
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6fca5455aaecbd14479f33f091aa19df2d3d2969
@@ -13,7 +13,7 @@ F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84
 F autoconf/Makefile.msc 68ed752a809b611d97b95d8572a34fe6fd1196f1
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
-F autoconf/README.txt ebf930270b2d6258f4d2c62c8c5a5dcc7cff5293
+F autoconf/README.txt fc86867528c500dfd691620e623bfe6799c98d14
 F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1
 F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
 F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
@@ -1421,7 +1421,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 12eb8db79697ef55228c78011d275f36f58271e1
-R f077ea8ac49bb767871086d72cc4aac2
-U drh
-Z 47e598e0236f733ea03c00ba7b81ee9b
+P 4ce60fa42d8486d219d40d25d785d7f2cabe5e06
+R 9ddb76e24748b77caceaf34a8b255b23
+U mistachkin
+Z 8a8dd4db0d2ee1de0599573a5cb1355c

diff --git a/manifest.uuid b/manifest.uuid
index ea84af834d4917986e5afadf2e8a16257769b5c2..c53057578b788d5fad916c821bd8b224b850ffb3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ce60fa42d8486d219d40d25d785d7f2cabe5e06
\ No newline at end of file
+9f02868df71d902a2b9118d0b06df18ee92b666b
\ No newline at end of file