Fossil SCM
Improve MinGW build docs.
Commit
c1c680eb289550f82d41de5532493312fbaaaf3e
Parent
2948c3fe22b876b…
1 file changed
+13
-7
+13
-7
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -111,23 +111,29 @@ | ||
| 111 | 111 | <li><p><i>Unix without running "configure"</i> → if you prefer to avoid |
| 112 | 112 | running configure, you can also use: <b>make -f Makefile.classic</b>. You may |
| 113 | 113 | want to make minor edits to Makefile.classic to configure the build for your |
| 114 | 114 | system. |
| 115 | 115 | |
| 116 | -<li><p><i>MinGW3.x (not 4.0)/MinGW-w64</i> → Use the mingw makefile: | |
| 117 | -"<b>make -f win/Makefile.mingw</b>". On a Windows box you will | |
| 118 | -need either Cygwin or Msys as build environment. On Cygwin, Linux | |
| 119 | -or Darwin you may want to make minor edits to win/Makefile.mingw | |
| 120 | -to configure the cross-compile environment. | |
| 116 | +<li><p><i>MinGW 3.x (<u>not</u> 4.x) / MinGW-w64</i> → Use the MinGW makefile: | |
| 117 | +"<b>make -f win/Makefile.mingw</b>". On a Windows box you will need either | |
| 118 | +Cygwin or Msys as build environment. On Cygwin, Linux or Darwin you may want | |
| 119 | +to make minor edits to win/Makefile.mingw to configure the cross-compile | |
| 120 | +environment. | |
| 121 | 121 | |
| 122 | 122 | To enable the native [./th1.md#tclEval | Tcl integration feature], use a |
| 123 | 123 | command line like the following (all on one line): |
| 124 | 124 | |
| 125 | 125 | <b>make -f win/Makefile.mingw FOSSIL_ENABLE_TCL=1 FOSSIL_ENABLE_TCL_STUBS=1 FOSSIL_ENABLE_TCL_PRIVATE_STUBS=1</b> |
| 126 | 126 | |
| 127 | -Hint: don't use MinGW-4.0, it will compile but fossil won't work correctly, see | |
| 128 | -<a href="https://www.fossil-scm.org/index.html/tktview/18cff45a4e210430e24c">https://www.fossil-scm.org/index.html/tktview/18cff45a4e210430e24c</a>. | |
| 127 | +Alternatively, <b>./configure</b> may now be used to create a Makefile | |
| 128 | +suitable for use with MinGW; however, options passed to configure that are | |
| 129 | +not applicable on Windows may cause the configuration or compilation to fail | |
| 130 | +(e.g. fusefs, internal-sqlite, etc). | |
| 131 | + | |
| 132 | +<i>HINT</i>: Do <u>not</u> use MinGW-4.x, it may compile but the Fossil binary | |
| 133 | +will not work correctly, see | |
| 134 | +[https://www.fossil-scm.org/index.html/tktview/18cff45a4e210430e24c | ticket]. | |
| 129 | 135 | |
| 130 | 136 | <li><p><i>MSVC</i> → Use the MSVC makefile. First |
| 131 | 137 | change to the "win/" subdirectory ("<b>cd win</b>") then run |
| 132 | 138 | "<b>nmake /f Makefile.msc</b>".<br><br>Alternatively, the batch |
| 133 | 139 | file "<b>win\buildmsvc.bat</b>" may be used and it will attempt to |
| 134 | 140 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -111,23 +111,29 @@ | |
| 111 | <li><p><i>Unix without running "configure"</i> → if you prefer to avoid |
| 112 | running configure, you can also use: <b>make -f Makefile.classic</b>. You may |
| 113 | want to make minor edits to Makefile.classic to configure the build for your |
| 114 | system. |
| 115 | |
| 116 | <li><p><i>MinGW3.x (not 4.0)/MinGW-w64</i> → Use the mingw makefile: |
| 117 | "<b>make -f win/Makefile.mingw</b>". On a Windows box you will |
| 118 | need either Cygwin or Msys as build environment. On Cygwin, Linux |
| 119 | or Darwin you may want to make minor edits to win/Makefile.mingw |
| 120 | to configure the cross-compile environment. |
| 121 | |
| 122 | To enable the native [./th1.md#tclEval | Tcl integration feature], use a |
| 123 | command line like the following (all on one line): |
| 124 | |
| 125 | <b>make -f win/Makefile.mingw FOSSIL_ENABLE_TCL=1 FOSSIL_ENABLE_TCL_STUBS=1 FOSSIL_ENABLE_TCL_PRIVATE_STUBS=1</b> |
| 126 | |
| 127 | Hint: don't use MinGW-4.0, it will compile but fossil won't work correctly, see |
| 128 | <a href="https://www.fossil-scm.org/index.html/tktview/18cff45a4e210430e24c">https://www.fossil-scm.org/index.html/tktview/18cff45a4e210430e24c</a>. |
| 129 | |
| 130 | <li><p><i>MSVC</i> → Use the MSVC makefile. First |
| 131 | change to the "win/" subdirectory ("<b>cd win</b>") then run |
| 132 | "<b>nmake /f Makefile.msc</b>".<br><br>Alternatively, the batch |
| 133 | file "<b>win\buildmsvc.bat</b>" may be used and it will attempt to |
| 134 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -111,23 +111,29 @@ | |
| 111 | <li><p><i>Unix without running "configure"</i> → if you prefer to avoid |
| 112 | running configure, you can also use: <b>make -f Makefile.classic</b>. You may |
| 113 | want to make minor edits to Makefile.classic to configure the build for your |
| 114 | system. |
| 115 | |
| 116 | <li><p><i>MinGW 3.x (<u>not</u> 4.x) / MinGW-w64</i> → Use the MinGW makefile: |
| 117 | "<b>make -f win/Makefile.mingw</b>". On a Windows box you will need either |
| 118 | Cygwin or Msys as build environment. On Cygwin, Linux or Darwin you may want |
| 119 | to make minor edits to win/Makefile.mingw to configure the cross-compile |
| 120 | environment. |
| 121 | |
| 122 | To enable the native [./th1.md#tclEval | Tcl integration feature], use a |
| 123 | command line like the following (all on one line): |
| 124 | |
| 125 | <b>make -f win/Makefile.mingw FOSSIL_ENABLE_TCL=1 FOSSIL_ENABLE_TCL_STUBS=1 FOSSIL_ENABLE_TCL_PRIVATE_STUBS=1</b> |
| 126 | |
| 127 | Alternatively, <b>./configure</b> may now be used to create a Makefile |
| 128 | suitable for use with MinGW; however, options passed to configure that are |
| 129 | not applicable on Windows may cause the configuration or compilation to fail |
| 130 | (e.g. fusefs, internal-sqlite, etc). |
| 131 | |
| 132 | <i>HINT</i>: Do <u>not</u> use MinGW-4.x, it may compile but the Fossil binary |
| 133 | will not work correctly, see |
| 134 | [https://www.fossil-scm.org/index.html/tktview/18cff45a4e210430e24c | ticket]. |
| 135 | |
| 136 | <li><p><i>MSVC</i> → Use the MSVC makefile. First |
| 137 | change to the "win/" subdirectory ("<b>cd win</b>") then run |
| 138 | "<b>nmake /f Makefile.msc</b>".<br><br>Alternatively, the batch |
| 139 | file "<b>win\buildmsvc.bat</b>" may be used and it will attempt to |
| 140 |