]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Enhance the notes on compiling for Windows11 to explain how to do
authordrh <>
Fri, 18 Aug 2023 11:36:33 +0000 (11:36 +0000)
committerdrh <>
Fri, 18 Aug 2023 11:36:33 +0000 (11:36 +0000)
32-bit builds on a 64-bit system.

FossilOrigin-Name: dd749e4042bdffb20fe71dd2dba91eab5edc32e4b2773c2fadba43cb54027a17

doc/compile-for-windows.md
manifest
manifest.uuid

index b4f8e04c5ca908fb8d7cbc37497130692c204044..84b0abe49eb9de10d46e74ef29aaf682089fc1a3 100644 (file)
@@ -60,3 +60,26 @@ canonical source on a new Windows 11 PC, as of 2023-08-16:
       <li>  `nmake /f makefile.msc devtest`
       <li>  `nmake /f makefile.msc releasetest`
       </ul>
+
+## 32-bit Builds
+
+Doing a 32-bit build is just like doing a 64-bit build with the
+following minor changes:
+
+  1.  Use the "x86 Native Tools Command Prompt" instead of
+      "x64 Native Tools Command Prompt".  "**x86**" instead of "**x64**".
+
+  2.  Use a different installation directory for TCL.
+      The recommended directory is `c:\tcl32`.  Thus you end up
+      with two TCL builds:
+      <ul>
+      <li> `c:\tcl` &larr;  64-bit (the default)
+      <li> `c:\tcl32` &larr;  32-bit
+      </ul>
+
+  3.  Ensure that c:\\tcl32\\bin comes before c:\\tcl\\bin on
+      your PATH environment variable.  You can achieve this using
+      a command like:
+      <ul>
+      <li>  `set PATH=c:\tcl32\bin;%PATH%`
+      </ul>
index 48f6ee7dba3933ae8f6bac899643f8ea1ec2f19a..c0af19f4ad908e192ab7ea8d5004327cd7f26e74 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\sbound\sparameters\sin\sthe\sON\sCONFLICT\sclause\sof\san\sUPSERT.\ndbsqlfuzz\s9983e2c77634a8ccf33b5c91fa9982599de5f9e9
-D 2023-08-17T17:48:20.472
+C Enhance\sthe\snotes\son\scompiling\sfor\sWindows11\sto\sexplain\show\sto\sdo\n32-bit\sbuilds\son\sa\s64-bit\ssystem.
+D 2023-08-18T11:36:33.593
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -37,7 +37,7 @@ F configure 9dc3300339f4d6b3c3b108de60cc6ae6b3c547e25c7e6df280b4775db4de3a1b x
 F configure.ac 4654d32ac0a0d0b48f1e1e79bdc3d777b723cf2f63c33eb1d7c4ed8b435938e8
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
-F doc/compile-for-windows.md a342ac53d5d38fc220cc643c4e0a8c0966bd6caa569f3d927cf10844f5f0aaca
+F doc/compile-for-windows.md e9d49959f44114a35dbec66f6aa5c3688ea9cb1b3f969a8537cd80b86d8969f7
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
 F doc/lemon.html d2862dbef72496e87f7996f37e814b146848190a742c12161d13fd15346051b0
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -2092,8 +2092,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 24d96bd65d8ccdd50a6f4fe217d196728a2f8658d128f9352c287f64e034104a
-R 72669b014bf41c72224f93b52bdb3a8f
+P 3c06709335eb4b98e3a684e3ebbae69eeb6a21b452bce29159c82bb632d6a042
+R 5286e789edef31734778a59dd4048b53
 U drh
-Z 40e3bdaa3753eb1f16c29d787d46c397
+Z a68f0d67c5ca7757b723ad9a4597974a
 # Remove this line to create a well-formed Fossil manifest.
index 27c598553bd5bd97ac796d44c07069d410437bf3..2934ce1fcb20ff1b63fe6a5f64eece5e863c541b 100644 (file)
@@ -1 +1 @@
-3c06709335eb4b98e3a684e3ebbae69eeb6a21b452bce29159c82bb632d6a042
\ No newline at end of file
+dd749e4042bdffb20fe71dd2dba91eab5edc32e4b2773c2fadba43cb54027a17
\ No newline at end of file