summaryrefslogtreecommitdiff
path: root/odk/docs/install.html
diff options
context:
space:
mode:
Diffstat (limited to 'odk/docs/install.html')
-rw-r--r--odk/docs/install.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 13425da0cfa1..e29b30a026d9 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -74,7 +74,7 @@
<td><b>JDK (1.5 or higher)</b></td>
<td class="content80">
<p>A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on <a target="_blank" href="http://java.sun.com/products" title="link to the Java SDK download page (online)">http://java.sun.com/products</a>.</p>
- <p>Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only.</p>
+ <p>Recommendation is to use Java 7 or later for 64bit, and Java 6 for 32bit.</p>
<p><b>Note</b>: The Java compiler is <b><u>optional</u></b>!</p></td>
</tr>
<tr valign="middle">
@@ -88,16 +88,16 @@
exists:
<table class="table4">
<tr>
- <td class="cell15">Solaris</td>
- <td class="cell85">Sun Studio 8 (20070730)</td>
+ <td class="cell15">Linux</td>
+ <td class="cell80">GNU C++ compiler, gcc version 4.1 or later</td>
</tr>
<tr>
- <td class="cell15">Linux</td>
- <td class="cell80">GNU C++ compiler, gcc version 4.0.1</td>
+ <td class="cell15">Mac OS X</td>
+ <td class="cell80">XCode</td>
</tr>
<tr>
<td class="cell15">Windows</td>
- <td class="cell80">Microsoft C++ Compiler, Microsoft Visual Studio 2008 or the Express version (cl, version 15.00.21022)</td>
+ <td class="cell80">Microsoft C++ Compiler, Microsoft Visual Studio 2010 or later, or the Express edition thereof</td>
</tr>
</table>
<p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&amp;displaylang=en">Microsoft Visual Studio 2008 Redistributable Package</a> is also installed. You can download this package from Microsoft directly.</p></td>