aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-10-04 18:46:39 +0000
committerGuy Harris <guy@alum.mit.edu>2012-10-04 18:46:39 +0000
commit79b3cd998934edbb53c50584a2b7e7c11dac3d15 (patch)
tree5687d2302837e9d8209f570325a4877266519031 /docbook
parent6d0f0a4ccc4764d5e11db87f8a484d38ba061452 (diff)
For VS 2010 EE, when building 64-bit, indicate why you need the SDK (to
compilers that generate 64-bit code). svn path=/trunk/; revision=45317
Diffstat (limited to 'docbook')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_tools.xml23
1 files changed, 14 insertions, 9 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml
index 6269fb523d..d9e0e6ff8a 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.xml
+++ b/docbook/wsdg_src/WSDG_chapter_tools.xml
@@ -368,7 +368,7 @@ PARTICULAR PURPOSE.]]>
<entry>
<para>
<filename>vcredist_x86.exe</filename>
- <superscript>3</superscript>
+ <superscript>4</superscript>
</para>
</entry>
</row>
@@ -429,7 +429,7 @@ PARTICULAR PURPOSE.]]>
<entry>
<para>
<filename>vcredist_x86.exe</filename>
- <superscript>3</superscript>
+ <superscript>4</superscript>
</para>
</entry>
</row>
@@ -500,14 +500,14 @@ PARTICULAR PURPOSE.]]>
<entry>
<para>
<filename>vcredist_x86.exe</filename>
- <superscript>3</superscript>
+ <superscript>4</superscript>
</para>
</entry>
</row>
<row>
<entry>
<para>Yes
- <superscript>2</superscript></para>
+ <superscript>3</superscript></para>
</entry>
<entry>
<para>64-bit</para>
@@ -519,14 +519,14 @@ PARTICULAR PURPOSE.]]>
<entry>
<para>
<filename>vcredist_x64.exe</filename>
- <superscript>3</superscript>
+ <superscript>4</superscript>
</para>
</entry>
</row>
<row>
<entry>
<para>.NET Framework 2.0 SDK
- <superscript>4</superscript></para>
+ <superscript>5</superscript></para>
</entry>
<entry>
<para>No</para>
@@ -553,7 +553,7 @@ PARTICULAR PURPOSE.]]>
<entry>
<para>
<filename>vcredist_x86.exe</filename>
- <superscript>3</superscript>
+ <superscript>4</superscript>
</para>
</entry>
</row>
@@ -572,7 +572,12 @@ PARTICULAR PURPOSE.]]>
setting batch file for the SDK!
</para>
<para>
- <superscript>3</superscript><filename>vcredist_x86.exe</filename>
+ <superscript>3</superscript>the Express Edition does not include
+ compilers or assemblers that can generate 64-bit code; those are
+ only included in the SDK
+ </para>
+ <para>
+ <superscript>4</superscript><filename>vcredist_x86.exe</filename>
(3MB free download) is required to build
<filename>Wireshark-win32-&WiresharkCurrentVersion;.x.exe</filename>,
and <filename>vcredist_x64.exe</filename> is required to build
@@ -583,7 +588,7 @@ PARTICULAR PURPOSE.]]>
installed for the compiler.
</para>
<para>
- <superscript>4</superscript>MSDN remarks that the
+ <superscript>5</superscript>MSDN remarks that the
corresponding .NET runtime is required. It's currently
unclear if the runtime needs to be installed for the C
compiler to work - or is this only needed to compile / run