diff options
author | Mike Pall <mike> | 2022-06-08 15:03:52 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2022-06-08 15:03:52 +0200 |
commit | 5f70f7723e149d823b3079ad4df33fda1644bd83 (patch) | |
tree | 7304bac7228cc25d76651e465730f2cc039cb607 | |
parent | 7beb3375e34583e01e5c6ab370721aaea56226cc (diff) | |
parent | fd86c924b9810cfb3034b03d08a2b77e243639c3 (diff) | |
download | luajit2-5f70f7723e149d823b3079ad4df33fda1644bd83.tar.gz |
Merge branch 'master' into v2.1
-rw-r--r-- | doc/install.html | 104 | ||||
-rw-r--r-- | doc/luajit.html | 2 |
2 files changed, 57 insertions, 49 deletions
diff --git a/doc/install.html b/doc/install.html index 8210f476..c3b951e4 100644 --- a/doc/install.html +++ b/doc/install.html @@ -181,6 +181,12 @@ LuaJIT currently builds out-of-the box on most systems: <td class="compatx">Xbox One SDK (DURANGO)</td> <td class="compatx">v2.1 –</td> </tr> +<tr class="even"> +<td class="compatname"><a href="#consoles">Nintendo Switch</a></td> +<td class="compatver"> </td> +<td class="compatx">NintendoSDK + NX Addon</td> +<td class="compatx">v2.1 –</td> +</tr> </table> <p> The codebase has compatibility defines for some more systems, but @@ -577,8 +583,7 @@ make DEFAULT_CC=clang CROSS="$(dirname $ICC)/" \ <h3 id="consoles">Cross-compiling for consoles</h3> <p> Building LuaJIT for consoles requires both a supported host compiler -(x86 or x64) and a cross-compiler (to PPC or ARM) from the official -console SDK. +(x86 or x64) and a cross-compiler from the official console SDK. </p> <p> Due to restrictions on consoles, the JIT compiler is disabled and only @@ -599,55 +604,58 @@ To cross-compile for <b id="ps3">PS3</b> from a Linux host (requires make HOST_CC="gcc -m32" CROSS=ppu-lv2- </pre> <p> -To cross-compile for <b id="ps4">PS4</b> from a Windows host, -open a "Visual Studio .NET Command Prompt" (64 bit host compiler), -<tt>cd</tt> to the directory where you've unpacked the sources and -run the following commands: -</p> -<pre class="code"> -cd src -ps4build -</pre> -<p> -To cross-compile for <b id="ps5">PS5</b> from a Windows host, -open a "Visual Studio .NET Command Prompt" (64 bit host compiler), -<tt>cd</tt> to the directory where you've unpacked the sources and -run the following commands: -</p> -<pre class="code"> -cd src -ps5build -</pre> -<p> -To cross-compile for <b id="psvita">PS Vita</b> from a Windows host, -open a "Visual Studio .NET Command Prompt" (32 bit host compiler), -<tt>cd</tt> to the directory where you've unpacked the sources and -run the following commands: +To cross-compile for the other consoles from a Windows host, open a +"Native Tools Command Prompt for VS". You need to choose either the 32 +or the 64 bit version of the host compiler to match the target. +Then <tt>cd</tt> to the <tt>src</tt> directory below where you've +unpacked the sources and run the build command given in the table: </p> -<pre class="code"> -cd src -psvitabuild -</pre> -<p> -To cross-compile for <b id="xbox360">Xbox 360</b> from a Windows host, -open a "Visual Studio .NET Command Prompt" (32 bit host compiler), -<tt>cd</tt> to the directory where you've unpacked the sources and run -the following commands: -</p> -<pre class="code"> -cd src -xedkbuild -</pre> +<table class="compat"> +<tr class="compathead"> +<td class="compatname">Console</td> +<td class="compatbits">Bits</td> +<td class="compatx">Build Command</td> +</tr> +<tr class="odd separate"> +<td class="compatname"><b id="ps4">PS4</b></td> +<td class="compatbits">64</td> +<td class="compatx"><tt>ps4build</tt></td> +</tr> +<tr class="even"> +<td class="compatname"><b id="ps5">PS5</b></td> +<td class="compatbits">64</td> +<td class="compatx"><tt>ps5build</tt></td> +</tr> +<tr class="odd"> +<td class="compatname"><b id="psvita">PS Vita</b></td> +<td class="compatbits">32</td> +<td class="compatx"><tt>psvitabuild</tt></td> +</tr> +<tr class="even"> +<td class="compatname"><b id="xbox360">Xbox 360</b></td> +<td class="compatbits">32</td> +<td class="compatx"><tt>xedkbuild</tt></td> +</tr> +<tr class="odd"> +<td class="compatname"><b id="xboxone">Xbox One</b></td> +<td class="compatbits">64</td> +<td class="compatx"><tt>xb1build</tt></td> +</tr> +<tr class="even"> +<td class="compatname"><b id="nx32">Nintendo Switch NX32</b></td> +<td class="compatbits">32</td> +<td class="compatx"><tt>nxbuild</tt></td> +</tr> +<tr class="odd"> +<td class="compatname"><b id="nx64">Nintendo Switch NX64</b></td> +<td class="compatbits">64</td> +<td class="compatx"><tt>nxbuild</tt></td> +</tr> +</table> <p> -To cross-compile for <b id="xboxone">Xbox One</b> from a Windows host, -open a "Visual Studio .NET Command Prompt" (64 bit host compiler), -<tt>cd</tt> to the directory where you've unpacked the sources and run -the following commands: +Please check out the comments in the corresponding <tt>*.bat</tt> +file for more options. </p> -<pre class="code"> -cd src -xb1build -</pre> <h2 id="embed">Embedding LuaJIT</h2> <p> diff --git a/doc/luajit.html b/doc/luajit.html index 06774ddf..03a29528 100644 --- a/doc/luajit.html +++ b/doc/luajit.html @@ -162,7 +162,7 @@ LuaJIT is Copyright © 2005-2022 Mike Pall, released under the <tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td></tr> </table> <table class="feature os os3"> -<tr><td>PS3</td><td>PS4</td><td>PS5</td><td>PS Vita</td><td>Xbox 360</td><td>Xbox One</td></tr> +<tr><td>PS3</td><td>PS4<br>PS5</td><td>PS Vita</td><td>Xbox 360</td><td>Xbox One</td><td>Nintendo<br>Switch</td></tr> </table> <table class="feature compiler"> <tr><td>GCC</td><td>Clang<br>LLVM</td><td>MSVC</td></tr> |