From: drh Date: Mon, 25 Jan 2016 23:19:58 +0000 (+0000) Subject: Minor changes to the autoconf/README.txt file. X-Git-Tag: version-3.11.0~92^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a72d15b5f0bbc0d67eb117624df7f005ad89c443;p=thirdparty%2Fsqlite.git Minor changes to the autoconf/README.txt file. FossilOrigin-Name: 6df8a9c00a9d067f67d492da7a4617908070c6c0 --- diff --git a/autoconf/README.txt b/autoconf/README.txt index a581c39dea..114831ec5e 100644 --- a/autoconf/README.txt +++ b/autoconf/README.txt @@ -9,6 +9,12 @@ This package contains: * a Makefile.msc and sqlite3.rc for building with Microsoft Visual C++ on Windows. +SUMMARY OF HOW TO BUILD +======================= + + unix: ./configure; make + windows: nmake /f Makefile.msc + BUILDING ON POSIX ================= @@ -47,7 +53,7 @@ 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 +Building for WinRT 8.0 ---------------------- FOR_WINRT=1 @@ -58,7 +64,7 @@ NMAKE command line as well: "NSDKLIBPATH=%WindowsSdkDir%\..\8.0\lib\win8\um\x86" -BUILDING FOR WINRT 8.1 +Building for WinRT 8.1 ---------------------- FOR_WINRT=1 @@ -69,7 +75,7 @@ NMAKE command line as well: "NSDKLIBPATH=%WindowsSdkDir%\..\8.1\lib\winv6.3\um\x86" -BUILDING FOR UAP 10.0 +Building for UAP 10.0 --------------------- FOR_WINRT=1 FOR_UAP=1 @@ -82,7 +88,7 @@ NMAKE command line as well: "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 +Building for the Windows 10 SDK ------------------------------- FOR_WIN10=1 @@ -90,7 +96,7 @@ BUILDING FOR THE WINDOWS 10 SDK 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 +Other preprocessor defines -------------------------- Additionally, preprocessor defines may be specified by using the OPTS macro diff --git a/manifest b/manifest index 0f3e8b7b8d..48622ea281 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\supdates\sto\sthe\sREADME. -D 2016-01-23T21:57:46.170 +C Minor\schanges\sto\sthe\sautoconf/README.txt\sfile. +D 2016-01-25T23:19:58.651 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 fc86867528c500dfd691620e623bfe6799c98d14 +F autoconf/README.txt e3a5cf0ba2d8944c71ca1eb7c06c15f52bfca131 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 4ce60fa42d8486d219d40d25d785d7f2cabe5e06 -R 9ddb76e24748b77caceaf34a8b255b23 -U mistachkin -Z 8a8dd4db0d2ee1de0599573a5cb1355c +P 9f02868df71d902a2b9118d0b06df18ee92b666b +R 9aeab9bcdca09d2b8e9198ca7dec65cb +U drh +Z 1be43b84d3a6e7c2425c5f0806c1fce0 diff --git a/manifest.uuid b/manifest.uuid index c53057578b..4cab521d6d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9f02868df71d902a2b9118d0b06df18ee92b666b \ No newline at end of file +6df8a9c00a9d067f67d492da7a4617908070c6c0 \ No newline at end of file