Skip to content

Commit

Permalink
Fix bullet lists for integration.md on readthedocs.io (microsoft#12873)
Browse files Browse the repository at this point in the history
  • Loading branch information
ftheile authored Aug 20, 2020
1 parent dfa7dc4 commit 5c056a6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions docs/users/integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ This will implicitly add Include Directories, Link Directories, and Link Librari
For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually.

Here are some examples, though this is not an exhaustive list:

- Gtest provides `gtest`, `gmock`, `gtest_main`, and `gmock_main`
- SDL2 provides `SDL2main`
- SFML provides `sfml-main`
Expand Down Expand Up @@ -81,6 +82,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
#### Manual compiler settings

Libraries are installed into the `installed\` subfolder, partitioned by architecture (e.g. x86-windows):

* The header files are installed to `installed\x86-windows\include`
* Release `.lib` files are installed to `installed\x86-windows\lib` or `installed\x86-windows\lib\manual-link`
* Release `.dll` files are installed to `installed\x86-windows\bin`
Expand Down Expand Up @@ -112,6 +114,7 @@ Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/
<a name="triplet-selection"></a>
### Triplet selection
Every integration mechanism besides manually adding the folders will deduce a [triplet][] for your project as one of:

- x86-windows
- x64-windows
- x86-uwp
Expand Down

0 comments on commit 5c056a6

Please sign in to comment.