diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-05 09:48:39 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-05 17:50:45 +0000 |
| commit | d1380119d4b28717753b0dd9ed2be12fff5e89b5 (patch) | |
| tree | d7731962d8964ba8e73267328d2b631a6d97f486 | |
| parent | 410a8d1cab5b1745bd570e04503227224e15968e (diff) | |
| download | wireshark-d1380119d4b28717753b0dd9ed2be12fff5e89b5.tar.gz | |
WSDG: Fixup admonition block formatting.
We tend to clobber the reader with admon blocks. Make the preceding and
succeeding ones normal paragraphs.
Change-Id: I0c70af93feb586d2e8f6120e2842fab52379b76f
Reviewed-on: https://code.wireshark.org/review/6970
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc index 03f2b4b2eb..1821400493 100644 --- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc @@ -89,34 +89,28 @@ You can use Chocolatey to install Visual Studio: PS$>choco install VisualStudioCommunity2013 ---- -[TIP] -.You can use other Microsoft C compiler variants, but VS2013 is used +You can use other Microsoft C compiler variants, but VS2013 is used to build the development releases and is the preferred option. -==== It's possible to compile Wireshark with a wide range of Microsoft C compiler variants. For details see -<<ChToolsMSChain>>! +<<ChToolsMSChain>>. [TIP] +.Is Win32.Mak missing? +==== For VS2013 (and later) Microsoft has left out a required file from the -include files to build with nmake. To fix this copy Win32.Mak from the Win 7 SDK +include files to build with nmake. To fix this copy Win32.Mak from the Win 7 SDK into an appropriate path for use with VS2013, e.g. ---- -xcopy C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include\Win32.Mak C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include +C:\> xcopy C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include\Win32.Mak C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include ---- ==== - -[WARNING] -.Don't use gcc or Clang -==== Compiling with gcc or Clang is not recommended and will -certainly not work (at least without a lot of advanced +certainly not work (at least not without a lot of advanced tweaking). For further details on this topic, see -<<ChToolsGNUChain>>. -==== -// XXX This is changing in regard to Clang: -// http://llvm.org/docs/GettingStartedVS.html +<<ChToolsGNUChain>>. This may change in future as releases +of Visual Studio add more cross-platform support. // XXX - mention the compiler and PSDK web installers - // which significantly reduce download size - and find out the |