Skip to content

Fix documentation #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thp merged 2 commits into from
Apr 22, 2018
Merged

Fix documentation #351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f844261
Mention Git as dependency in automatic Visual Studio builds
nitsch Mar 17, 2018
4114cf3
Fix binary build locations on Windows in documentation
nitsch Mar 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/build.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ You need to install the following requirements:

- `Visual Studio Community 2013`_, `Visual Studio Community 2015`_ or `Visual Studio Community 2017` (recommended)
- `CMake`_ 3.9.1 or newer
- `Git`_


.. _`Visual Studio Community 2013`: http://www.visualstudio.com/en-us/news/vs2013-community-vs.aspx
.. _`Visual Studio Community 2015`: https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx
.. _`Visual Studio Community 2017`: https://www.visualstudio.com/en-us/downloads/
.. _`CMake`: http://www.cmake.org/cmake/resources/software.html
.. _`Git`: https://gitforwindows.org/

Automatic build
~~~~~~~~~~~~~~~
Expand All @@ -88,8 +90,8 @@ For Visual Studio 2017 and 32-bit use::

For Visual Studio 2015 and 2013, replace 2017 accordingly.

The resulting binaries will be placed in ``build-x86/[Debug/Release]`` (for
the 32-bit build) and ``build-x64/[Debug/Release]`` (for the 64-bit build).
The resulting binaries will be placed in ``build-x86/`` (for the 32-bit build)
and ``build-x64/`` (for the 64-bit build).


Cross-Compiling for Windows (MinGW)
Expand Down