From: drh Date: Mon, 25 Jan 2016 23:24:38 +0000 (+0000) Subject: Add the ability to do Windows builds to the amalgamation tarball. X-Git-Tag: version-3.11.0~92 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e0caad428b75d6c54cbb58d022730dcee563f1d;p=thirdparty%2Fsqlite.git Add the ability to do Windows builds to the amalgamation tarball. FossilOrigin-Name: abd2b357c55fdcdbc8e66a81a3fbb7f822ea0a4f --- 9e0caad428b75d6c54cbb58d022730dcee563f1d diff --cc autoconf/README.txt index 0000000000,114831ec5e..c27c08d0df mode 000000,100644..100644 --- a/autoconf/README.txt +++ b/autoconf/README.txt @@@ -1,0 -1,113 +1,113 @@@ + This package contains: + + * the SQLite library amalgamation (single file) source code distribution, + * 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 + compliant systems. + * 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 ++ Unix: ./configure; make ++ Windows: nmake /f Makefile.msc + + BUILDING ON POSIX + ================= + + The generic installation instructions for autoconf/automake are found + in the INSTALL file. + + The following SQLite specific boolean options are supported: + + --enable-readline use readline in shell tool [default=yes] + --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 + compiler) includes debugging symbols in the build, resulting in larger + binaries than are necessary. Override it on the configure command + line like this: + + $ CFLAGS="-Os" ./configure + + to produce a smaller installation footprint. + + Other SQLite compilation parameters can also be set using CFLAGS. For + example: + + $ CFLAGS="-Os -DSQLITE_OMIT_TRIGGERS" ./configure + + + BUILDING WITH MICROSOFT VISUAL C++ + ================================== + + To compile for Windows using Microsoft Visual C++: + + $ 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. + + Other 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 --cc manifest index 5a7fe0a637,48622ea281..f3535e3905 --- a/manifest +++ b/manifest @@@ -1,8 -1,8 +1,8 @@@ - C Fix\sa\scompiler\swarning\sabout\sdoing\spointer\sarithmetic\sinvolving\sa\sNULL\spointer\neven\sthough\sthe\sresult\sof\scomputation\sis\snever\sused. - D 2016-01-25T22:08:11.961 -C Minor\schanges\sto\sthe\sautoconf/README.txt\sfile. -D 2016-01-25T23:19:58.651 ++C Add\sthe\sability\sto\sdo\sWindows\sbuilds\sto\sthe\samalgamation\starball. ++D 2016-01-25T23:24:38.805 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 - F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9 + F Makefile.msc 6fca5455aaecbd14479f33f091aa19df2d3d2969 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -10,9 -10,10 +10,10 @@@ F art/sqlite370.eps aa97a671332b432a54e F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 - F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d - F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38 + F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84 + F autoconf/Makefile.msc 68ed752a809b611d97b95d8572a34fe6fd1196f1 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7 -F autoconf/README.txt e3a5cf0ba2d8944c71ca1eb7c06c15f52bfca131 ++F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa w autoconf/README F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1 F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873 @@@ -1419,7 -1421,7 +1421,8 @@@ F tool/vdbe_profile.tcl 246d0da094856d7 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 7ac017a498b6fb28343eef2d24e400c7800660d6 - R aa5d51a793ca6d0a7613986a1affa54a -P 9f02868df71d902a2b9118d0b06df18ee92b666b -R 9aeab9bcdca09d2b8e9198ca7dec65cb ++P 7c49a9478bd36564e81d33458ca1f4063ddaca83 6df8a9c00a9d067f67d492da7a4617908070c6c0 ++R c1478777421253ac0125637ca661aa71 ++T +closed 6df8a9c00a9d067f67d492da7a4617908070c6c0 U drh - Z 142832d114ade2d8f5ff5fab3faed40b -Z 1be43b84d3a6e7c2425c5f0806c1fce0 ++Z 730cfb6cf754e8e26f747fb36fc92bb4 diff --cc manifest.uuid index d34f9b48c8,4cab521d6d..0029a388e0 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 7c49a9478bd36564e81d33458ca1f4063ddaca83 -6df8a9c00a9d067f67d492da7a4617908070c6c0 ++abd2b357c55fdcdbc8e66a81a3fbb7f822ea0a4f