diff options
| author | Frank Theile <frank.theile@web.de> | 2020-08-20 06:13:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 21:13:37 -0700 |
| commit | 5c056a65bb316f0114f536fdbb04f344b84d38c3 (patch) | |
| tree | 3dec09c7446246c084b6aa0b8360b4b9241310ce /docs/users | |
| parent | dfa7dc4276cbb11aad483fc0b9324ae0cfa1e62d (diff) | |
| download | vcpkg-5c056a65bb316f0114f536fdbb04f344b84d38c3.tar.gz vcpkg-5c056a65bb316f0114f536fdbb04f344b84d38c3.zip | |
Fix bullet lists for integration.md on readthedocs.io (#12873)
Diffstat (limited to 'docs/users')
| -rw-r--r-- | docs/users/integration.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/users/integration.md b/docs/users/integration.md index e9a9c42cd..e9d8940aa 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -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` @@ -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` @@ -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 |