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