From c777a3965035b6e4bb782b7f4868335792fdc025 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Sep 2021 17:44:57 +0200 Subject: [PATCH] Fix appearance of "%" in wxMSW install instructions Te changes of 74c51eaff2 (Fix formatting of wxMSW build instructions, 2021-07-13) broke the rendered output of "%WXWIN%", for some reason the leading percent sign needs to be double to appear correctly inside the backticks, so do it to fix this. Closes #19260. --- docs/msw/install.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/msw/install.md b/docs/msw/install.md index 9365b16d4f..0d30b57299 100644 --- a/docs/msw/install.md +++ b/docs/msw/install.md @@ -69,7 +69,7 @@ This needs to be done from the "Visual Studio Command Prompt" window, which can be opened using a shortcut installed to the "Start" menu or the "Start" screen by MSVS installation. -In this window, change directory to `%WXWIN%\build\msw` and type +In this window, change directory to `%%WXWIN%\build\msw` and type > nmake /f makefile.vc @@ -91,7 +91,7 @@ to build a 64 bit release DLL version from an x64 command prompt. See [Make Parameters](#msw_build_make_params) for more information about the additional parameters that can be specified on the command line. -To verify your build, change the directory to `%WXWIN%\samples\minimal` and +To verify your build, change the directory to `%%WXWIN%\samples\minimal` and run the same nmake command (with the same parameters there), this should create a working minimal wxWidgets sample. @@ -147,8 +147,8 @@ your responsibility to monitor for such situations. Debug visualizers for Visual Studio 2012+ are provided which makes inspecting various wxWidgets classes easier to view while debugging. To use them: -1. Open the folder `%WXWIN%\misc\msvc` -2. Open the folder `%USERPROFILE%\My Documents\Visual Studio 2012\Visualizers` +1. Open the folder `%%WXWIN%\misc\msvc` +2. Open the folder `%%USERPROFILE%\My Documents\Visual Studio 2012\Visualizers` (or the corresponding location for newer versions, e.g. `...2013\Visualizers`) 3. Copy `wxWidgets.natvis` and `autoexp.inc` 4. For Visual Studio 2013+ additionally copy `wxWidgets.2013.natvis` @@ -223,7 +223,7 @@ shell, as is the case with MSYS. Follow the instructions for using configure above instead if you prefer to use Unix shell. The commands shown here must be executed from a DOS command line window (cmd.exe, *not* Bash sh.exe). -1. Change directory to `%WXWIN%\build\msw` and type +1. Change directory to `%%WXWIN%\build\msw` and type > mingw32-make -f makefile.gcc @@ -259,7 +259,7 @@ Library configuration ---------------------------------------------------------------- While it is never necessary to do it, you may want to change some of -the options in the `%WXWIN%\include\wx\msw\setup.h` file before building +the options in the `%%WXWIN%\include\wx\msw\setup.h` file before building wxWidgets. This file is heavily commented, please read it and enable or disable the features you would like to compile wxWidgets with[out]. @@ -402,7 +402,7 @@ The full list of the build settings follows: different setup.h settings coexisting in same tree. The value of this option is appended to the build directories names. This is useful for building the library in some non-default configuration, - e.g. you could change `wxUSE_STL` to 1 in `%WXWIN%\include\wx\msw\setup.h` and + e.g. you could change `wxUSE_STL` to 1 in `%%WXWIN%\include\wx\msw\setup.h` and then build with `CFG=-stl`. Alternatively, you could build with e.g. `RUNTIME_LIBS=static CFG=-mt` when using MSVC.