aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMike Pall <mike>2022-06-08 15:03:52 +0200
committerMike Pall <mike>2022-06-08 15:03:52 +0200
commit5f70f7723e149d823b3079ad4df33fda1644bd83 (patch)
tree7304bac7228cc25d76651e465730f2cc039cb607 /doc
parent7beb3375e34583e01e5c6ab370721aaea56226cc (diff)
parentfd86c924b9810cfb3034b03d08a2b77e243639c3 (diff)
downloadluajit-5f70f7723e149d823b3079ad4df33fda1644bd83.tar.gz
luajit-5f70f7723e149d823b3079ad4df33fda1644bd83.tar.bz2
luajit-5f70f7723e149d823b3079ad4df33fda1644bd83.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'doc')
-rw-r--r--doc/install.html104
-rw-r--r--doc/luajit.html2
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:
181<td class="compatx">Xbox One SDK (DURANGO)</td> 181<td class="compatx">Xbox One SDK (DURANGO)</td>
182<td class="compatx">v2.1 &ndash;</td> 182<td class="compatx">v2.1 &ndash;</td>
183</tr> 183</tr>
184<tr class="even">
185<td class="compatname"><a href="#consoles">Nintendo Switch</a></td>
186<td class="compatver">&nbsp;</td>
187<td class="compatx">NintendoSDK + NX Addon</td>
188<td class="compatx">v2.1 &ndash;</td>
189</tr>
184</table> 190</table>
185<p> 191<p>
186The codebase has compatibility defines for some more systems, but 192The codebase has compatibility defines for some more systems, but
@@ -577,8 +583,7 @@ make DEFAULT_CC=clang CROSS="$(dirname $ICC)/" \
577<h3 id="consoles">Cross-compiling for consoles</h3> 583<h3 id="consoles">Cross-compiling for consoles</h3>
578<p> 584<p>
579Building LuaJIT for consoles requires both a supported host compiler 585Building LuaJIT for consoles requires both a supported host compiler
580(x86 or x64) and a cross-compiler (to PPC or ARM) from the official 586(x86 or x64) and a cross-compiler from the official console SDK.
581console SDK.
582</p> 587</p>
583<p> 588<p>
584Due to restrictions on consoles, the JIT compiler is disabled and only 589Due 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
599make HOST_CC="gcc -m32" CROSS=ppu-lv2- 604make HOST_CC="gcc -m32" CROSS=ppu-lv2-
600</pre> 605</pre>
601<p> 606<p>
602To cross-compile for <b id="ps4">PS4</b> from a Windows host, 607To cross-compile for the other consoles from a Windows host, open a
603open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler), 608"Native Tools Command Prompt for VS". You need to choose either the 32
604<tt>cd</tt> to the directory where you've unpacked the sources and 609or the 64&nbsp;bit version of the host compiler to match the target.
605run the following commands: 610Then <tt>cd</tt> to the <tt>src</tt> directory below where you've
606</p> 611unpacked the sources and run the build command given in the table:
607<pre class="code">
608cd src
609ps4build
610</pre>
611<p>
612To cross-compile for <b id="ps5">PS5</b> from a Windows host,
613open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler),
614<tt>cd</tt> to the directory where you've unpacked the sources and
615run the following commands:
616</p>
617<pre class="code">
618cd src
619ps5build
620</pre>
621<p>
622To cross-compile for <b id="psvita">PS Vita</b> from a Windows host,
623open a "Visual Studio .NET Command Prompt" (32&nbsp;bit host compiler),
624<tt>cd</tt> to the directory where you've unpacked the sources and
625run the following commands:
626</p> 612</p>
627<pre class="code"> 613<table class="compat">
628cd src 614<tr class="compathead">
629psvitabuild 615<td class="compatname">Console</td>
630</pre> 616<td class="compatbits">Bits</td>
631<p> 617<td class="compatx">Build Command</td>
632To cross-compile for <b id="xbox360">Xbox 360</b> from a Windows host, 618</tr>
633open a "Visual Studio .NET Command Prompt" (32&nbsp;bit host compiler), 619<tr class="odd separate">
634<tt>cd</tt> to the directory where you've unpacked the sources and run 620<td class="compatname"><b id="ps4">PS4</b></td>
635the following commands: 621<td class="compatbits">64</td>
636</p> 622<td class="compatx"><tt>ps4build</tt></td>
637<pre class="code"> 623</tr>
638cd src 624<tr class="even">
639xedkbuild 625<td class="compatname"><b id="ps5">PS5</b></td>
640</pre> 626<td class="compatbits">64</td>
627<td class="compatx"><tt>ps5build</tt></td>
628</tr>
629<tr class="odd">
630<td class="compatname"><b id="psvita">PS Vita</b></td>
631<td class="compatbits">32</td>
632<td class="compatx"><tt>psvitabuild</tt></td>
633</tr>
634<tr class="even">
635<td class="compatname"><b id="xbox360">Xbox 360</b></td>
636<td class="compatbits">32</td>
637<td class="compatx"><tt>xedkbuild</tt></td>
638</tr>
639<tr class="odd">
640<td class="compatname"><b id="xboxone">Xbox One</b></td>
641<td class="compatbits">64</td>
642<td class="compatx"><tt>xb1build</tt></td>
643</tr>
644<tr class="even">
645<td class="compatname"><b id="nx32">Nintendo Switch NX32</b></td>
646<td class="compatbits">32</td>
647<td class="compatx"><tt>nxbuild</tt></td>
648</tr>
649<tr class="odd">
650<td class="compatname"><b id="nx64">Nintendo Switch NX64</b></td>
651<td class="compatbits">64</td>
652<td class="compatx"><tt>nxbuild</tt></td>
653</tr>
654</table>
641<p> 655<p>
642To cross-compile for <b id="xboxone">Xbox One</b> from a Windows host, 656Please check out the comments in the corresponding <tt>*.bat</tt>
643open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler), 657file for more options.
644<tt>cd</tt> to the directory where you've unpacked the sources and run
645the following commands:
646</p> 658</p>
647<pre class="code">
648cd src
649xb1build
650</pre>
651 659
652<h2 id="embed">Embedding LuaJIT</h2> 660<h2 id="embed">Embedding LuaJIT</h2>
653<p> 661<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 &copy; 2005-2022 Mike Pall, released under the
162<tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td></tr> 162<tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td></tr>
163</table> 163</table>
164<table class="feature os os3"> 164<table class="feature os os3">
165<tr><td>PS3</td><td>PS4</td><td>PS5</td><td>PS Vita</td><td>Xbox 360</td><td>Xbox One</td></tr> 165<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>
166</table> 166</table>
167<table class="feature compiler"> 167<table class="feature compiler">
168<tr><td>GCC</td><td>Clang<br>LLVM</td><td>MSVC</td></tr> 168<tr><td>GCC</td><td>Clang<br>LLVM</td><td>MSVC</td></tr>