From: shearer <shearer@noemail.net>
Date: Tue, 3 Nov 2020 11:54:42 +0000 (+0000)
Subject: Make platform compilation clearer, including the section that applies to both *ix... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fdocupdate;p=thirdparty%2Fsqlite.git

Make platform compilation clearer, including the section that applies to both *ix and Windows
Add link to the detailed compilation instructions
Add brief Android section, it seems strange to omit it since Android is the majority use case by numbers

FossilOrigin-Name: 2a71bebfe3139a74736bd87a07b79ccfe73beb2a21d56d3804faa698c3f6edb8
---

diff --git a/README.md b/README.md
index b0b6b6df0a..d160733075 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ You can always update to the lastest version using:
 
 Or type "fossil ui" to get a web-based user interface.
 
-## Compiling
+## Compiling - Linux and Unix-like Operating Systems
 
 First create a directory in which to place
 the build products.  It is recommended, but not required, that the
@@ -94,7 +94,7 @@ script does not work out for you, there is a generic makefile named
 can copy and edit to suit your needs.  Comments on the generic makefile
 show what changes are needed.
 
-## Using MSVC
+## Compiling - Using MSVC on Windows
 
 On Windows, all applicable build products can be compiled with MSVC.
 First open the command prompt window associated with the desired compiler
@@ -117,10 +117,20 @@ to the "sqlite3.dll" command line above.  When debugging into the SQLite
 code, adding the "DEBUG=1" argument to one of the above command lines is
 recommended.
 
+## Further Information for Windows and Linux/Unix
+
+You may want to refer to the [more detailed compilation instructions](https://www.sqlite.org/howtocompile.html) .
+
 SQLite does not require [Tcl](http://www.tcl.tk/) to run, but a Tcl installation
 is required by the makefiles (including those for MSVC).  SQLite contains
 a lot of generated code and Tcl is used to do much of that code generation.
 
+## Compiling - Android
+
+The [Android version of SQLite](https://sqlite.org/android/doc/trunk/www/install.wiki) is in
+its own repository. You will need the Android SDK and NDK, and to follow the 
+[Android-specific build instructions](https://sqlite.org/android/doc/trunk/www/install.wiki).
+
 ## Source Code Tour
 
 Most of the core source files are in the **src/** subdirectory.  The
diff --git a/manifest b/manifest
index 24a765c24a..2cea9287e3 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 B 6646d7898ca1d2f71ec906d9613fbfc5c59c6cf05f053529e6e32ab826d1cb78
-C Update\sfor\snew\sgit-style\ssyntax\sin\sFossil
-D 2020-11-03T11:27:41.630
-F README.md 12dd29542b53ddaa6382da65620caa5ea40f2503667a062649fbae101e2bb1f0
-P e03867e2fbb6bb9c04e13442508c252fd952b397b40aa457cbff09ab1a17d4f7
-R 683a30ccba749d49e2f8cd73dc6190e8
+C Make\splatform\scompilation\sclearer,\sincluding\sthe\ssection\sthat\sapplies\sto\sboth\s*ix\sand\sWindows\nAdd\slink\sto\sthe\sdetailed\scompilation\sinstructions\nAdd\sbrief\sAndroid\ssection,\sit\sseems\sstrange\sto\somit\sit\ssince\sAndroid\sis\sthe\smajority\suse\scase\sby\snumbers
+D 2020-11-03T11:54:42.444
+F README.md dba93c9ca52fbed9c273cf424828501fdf2330044789800c5633d4568cfc9cf5
+P d46b6778b12be39dc101e5decfd9cde7643312d79d4b9af8d75a9bdc8a7481cd
+R 0fc7e728d66dd872dc94f2925583217a
 U shearer
-Z f9f28980f7a0f036d904e7e655780d67
+Z 8489fbb69780c82a81897a278314d28b
diff --git a/manifest.uuid b/manifest.uuid
index 9e5c96db35..326a54ea8e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d46b6778b12be39dc101e5decfd9cde7643312d79d4b9af8d75a9bdc8a7481cd
\ No newline at end of file
+2a71bebfe3139a74736bd87a07b79ccfe73beb2a21d56d3804faa698c3f6edb8
\ No newline at end of file