File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed
Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -181,8 +181,13 @@ remember to clear your artifacts before re-building::
181181
182182 git clean -xfd
183183
184+ <<<<<<< HEAD
184185From source files
185186^^^^^^^^^^^^^^^^^
187+ =======
188+ Use source
189+ ^^^^^^^^^^
190+ >>>>>>> 2d91bb2741 (note required MinGW windows header version)
186191
187192If the automatic download does not work (for example, on air-gapped systems) it is
188193preferable to instead use system libraries. However you can manually download the
@@ -274,6 +279,8 @@ source files.
274279
275280 Alternatively, you can install a Linux-like environment such as `CygWin <https://www.cygwin.com/ >`_
276281 or `Windows Subsystem for Linux <https://learn.microsoft.com/en-us/windows/wsl/install >`_.
282+ If using `MinGW-64 <https://www.mingw-w64.org/ >`_, we require **v6 ** of the
283+ ```Mingw-w64-x86_64-headers ``.
277284
278285
279286We highly recommend that you install a compiler using your platform tool, i.e.,
You can’t perform that action at this time.
0 commit comments