From 8d5cbff2954a425731057a206a8e769a5bc53e16 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 7 Feb 2017 15:04:07 -0800 Subject: [examples] Add the manual-link directories to the Examples documentation --- docs/EXAMPLES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/EXAMPLES.md b/docs/EXAMPLES.md index 6302dab07..cc100c4ca 100644 --- a/docs/EXAMPLES.md +++ b/docs/EXAMPLES.md @@ -150,9 +150,9 @@ PS D:\src\cmake-test\build> .\Debug\main.exe 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` +* 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` -* Debug `.lib` files are installed to `installed\x86-windows\debug\lib` +* Debug `.lib` files are installed to `installed\x86-windows\debug\lib` or `installed\x86-windows\debug\lib\manual-link` * Debug `.dll` files are installed to `installed\x86-windows\debug\bin` See your build system specific documentation for how to use prebuilt binaries. -- cgit v1.2.3 From 5e588ddb5be9e6e27cebcc3be2e1a27f3ca83a50 Mon Sep 17 00:00:00 2001 From: Oleksii Mandrychenko Date: Wed, 8 Feb 2017 19:11:00 +0000 Subject: Improved formatting of doc/EXAMPLES.md - added "./" so that commands can be copy-pasted into the PowerShel --- docs/EXAMPLES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/EXAMPLES.md b/docs/EXAMPLES.md index d991d87f9..f67ce3313 100644 --- a/docs/EXAMPLES.md +++ b/docs/EXAMPLES.md @@ -3,7 +3,7 @@ ## Overview Vcpkg helps you get C and C++ libraries on Windows. -For short description of available commands, run `vcpkg help`. +For short description of available commands, run `./vcpkg help`. ## Table of Contents - Example 1: Using the C++ REST SDK @@ -87,7 +87,7 @@ To install for other architectures and platforms such as Universal Windows Platf PS D:\src\vcpkg> .\vcpkg install cpprestsdk:x86-uwp zlib:x64-windows ``` -See `vcpkg help triplet` for all supported targets. +See `.\vcpkg help triplet` for all supported targets. ### Step 2: Use @@ -105,7 +105,7 @@ Installing new libraries will make them instantly available. ``` *Note: You will need to restart Visual Studio or perform a Build to update intellisense with the changes.* -To remove the integration for your user, you can use `vcpkg integrate remove`. +To remove the integration for your user, you can use `./vcpkg integrate remove`. #### Option B: CMake (Toolchain File) -- cgit v1.2.3 From 7cba4eb1a5c458a0c3a716c2808a7a8318a40005 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 8 Feb 2017 15:14:29 -0800 Subject: [examples] Replace ./ with .\ to preserve copy-paste into cmd. --- docs/EXAMPLES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/EXAMPLES.md b/docs/EXAMPLES.md index b6a219b4f..1a2bacc99 100644 --- a/docs/EXAMPLES.md +++ b/docs/EXAMPLES.md @@ -3,7 +3,7 @@ ## Overview Vcpkg helps you get C and C++ libraries on Windows. -For short description of available commands, run `./vcpkg help`. +For short description of available commands, run `.\vcpkg help`. ## Table of Contents - Example 1: Using Sqlite -- cgit v1.2.3