aboutsummaryrefslogtreecommitdiff
path: root/doc/install.html
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/install.html45
1 files changed, 6 insertions, 39 deletions
diff --git a/doc/install.html b/doc/install.html
index 8085573b..700d6edf 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -116,14 +116,14 @@ operating systems, CPUs and compilers:
116<td class="compatos">GCC 4.2+</td> 116<td class="compatos">GCC 4.2+</td>
117<td class="compatos">GCC 4.2+</td> 117<td class="compatos">GCC 4.2+</td>
118<td class="compatos">XCode 5.0+<br>Clang</td> 118<td class="compatos">XCode 5.0+<br>Clang</td>
119<td class="compatos">MSVC, MSVC/EE<br>WinSDK<br>MinGW, Cygwin</td> 119<td class="compatos">MSVC<br>MinGW, Cygwin</td>
120</tr> 120</tr>
121<tr class="even"> 121<tr class="even">
122<td class="compatcpu">x64 (64 bit)</td> 122<td class="compatcpu">x64 (64 bit)</td>
123<td class="compatos">GCC 4.2+</td> 123<td class="compatos">GCC 4.2+</td>
124<td class="compatos">GCC 4.2+<br>ORBIS (<a href="#ps4">PS4</a>)</td> 124<td class="compatos">GCC 4.2+<br>ORBIS (<a href="#ps4">PS4</a>)</td>
125<td class="compatos">XCode 5.0+<br>Clang</td> 125<td class="compatos">XCode 5.0+<br>Clang</td>
126<td class="compatos">MSVC + SDK v7.0<br>WinSDK v7.0<br>Durango (<a href="#xboxone">Xbox One</a>)</td> 126<td class="compatos">MSVC<br>Durango (<a href="#xboxone">Xbox One</a>)</td>
127</tr> 127</tr>
128<tr class="odd"> 128<tr class="odd">
129<td class="compatcpu"><a href="#cross2">ARMv5+<br>ARM9E+</a></td> 129<td class="compatcpu"><a href="#cross2">ARMv5+<br>ARM9E+</a></td>
@@ -168,7 +168,7 @@ only).</li>
168<li><tt>src/Makefile</tt> has settings for <b>compiling</b> LuaJIT 168<li><tt>src/Makefile</tt> has settings for <b>compiling</b> LuaJIT
169under POSIX, MinGW or Cygwin.</li> 169under POSIX, MinGW or Cygwin.</li>
170<li><tt>src/msvcbuild.bat</tt> has settings for compiling LuaJIT with 170<li><tt>src/msvcbuild.bat</tt> has settings for compiling LuaJIT with
171MSVC or WinSDK.</li> 171MSVC (Visual Studio).</li>
172</ul> 172</ul>
173<p> 173<p>
174Please read the instructions given in these files, before changing 174Please read the instructions given in these files, before changing
@@ -253,17 +253,7 @@ Either install one of the open source SDKs
253(<a href="http://mingw.org/"><span class="ext">&raquo;</span>&nbsp;MinGW</a> or 253(<a href="http://mingw.org/"><span class="ext">&raquo;</span>&nbsp;MinGW</a> or
254<a href="http://www.cygwin.com/"><span class="ext">&raquo;</span>&nbsp;Cygwin</a>), which come with a modified 254<a href="http://www.cygwin.com/"><span class="ext">&raquo;</span>&nbsp;Cygwin</a>), which come with a modified
255GCC plus the required development headers. 255GCC plus the required development headers.
256</p> 256Or install Microsoft's Visual Studio (MSVC).
257<p>
258Or install Microsoft's Visual C++ (MSVC). The freely downloadable
259<a href="http://www.microsoft.com/Express/VC/"><span class="ext">&raquo;</span>&nbsp;Express Edition</a>
260works just fine, but only contains an x86 compiler.
261</p>
262<p>
263The freely downloadable
264<a href="http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx"><span class="ext">&raquo;</span>&nbsp;Windows SDK</a>
265only comes with command line tools, but this is all you need to build LuaJIT.
266It contains x86 and x64 compilers.
267</p> 257</p>
268<p> 258<p>
269Next, download the source package and unpack it using an archive manager 259Next, download the source package and unpack it using an archive manager
@@ -271,7 +261,7 @@ Next, download the source package and unpack it using an archive manager
271</p> 261</p>
272<h3>Building with MSVC</h3> 262<h3>Building with MSVC</h3>
273<p> 263<p>
274Open a "Visual Studio .NET Command Prompt", <tt>cd</tt> to the 264Open a "Visual Studio Command Prompt" (either x86 or x64), <tt>cd</tt> to the
275directory where you've unpacked the sources and run these commands: 265directory where you've unpacked the sources and run these commands:
276</p> 266</p>
277<pre class="code"> 267<pre class="code">
@@ -279,30 +269,7 @@ cd src
279msvcbuild 269msvcbuild
280</pre> 270</pre>
281<p> 271<p>
282Then follow the installation instructions below. 272Check the <tt>msvcbuild.bat</tt> file for more options.
283</p>
284<h3>Building with the Windows SDK</h3>
285<p>
286Open a "Windows SDK Command Shell" and select the x86 compiler:
287</p>
288<pre class="code">
289setenv /release /x86
290</pre>
291<p>
292Or select the x64 compiler:
293</p>
294<pre class="code">
295setenv /release /x64
296</pre>
297<p>
298Then <tt>cd</tt> to the directory where you've unpacked the sources
299and run these commands:
300</p>
301<pre class="code">
302cd src
303msvcbuild
304</pre>
305<p>
306Then follow the installation instructions below. 273Then follow the installation instructions below.
307</p> 274</p>
308<h3>Building with MinGW or Cygwin</h3> 275<h3>Building with MinGW or Cygwin</h3>