Merge branch 'master' into v2.1

2 files changed, 19 insertions, 3 deletions

diff --git a/doc/install.html b/doc/install.html
index b2edf3f7..7d698272 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -122,7 +122,7 @@ operating systems, CPUs and compilers:
 <tr class="even">
 <td class="compatcpu">x64 (64 bit)</td>
 <td class="compatos">GCC 4.x</td>
-<td class="compatos compatno">&nbsp;</td>
+<td class="compatos">ORBIS (<a href="#ps4">PS4</a>)</td>
 <td class="compatos">GCC 4.x</td>
 <td class="compatos">MSVC + SDK v7.0<br>WinSDK v7.0</td>
 </tr>
@@ -462,7 +462,7 @@ make HOST_CC="gcc -m32 -arch i386" CROSS=$ISDKP TARGET_FLAGS="$ISDKF" \
 </pre>
 <p>
 You can cross-compile for <b id="ps3">PS3</b> using the PS3&nbsp;SDK from
-a Linux host or a Windows host (requires 32 bit MinGW (GCC) on the host,
+a Linux host or a Windows host (requires 32&nbsp;bit MinGW (GCC) on the host,
 too). Due to restrictions on consoles, the JIT compiler is disabled and
 only the fast interpreter is built:
 </p>
@@ -470,6 +470,22 @@ only the fast interpreter is built:
 make HOST_CC="gcc -m32" CROSS=ppu-lv2-
 </pre>
 <p>
+You can cross-compile for <b id="ps4">PS4</b> from a Windows host using
+the PS4&nbsp;SDK (ORBIS) plus 64&nbsp;bit MSVC. Due to restrictions on
+consoles, the JIT compiler is disabled and only the fast interpreter
+is built.
+</p>
+<p>
+Open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler),
+<tt>cd</tt> to the directory where you've unpacked the sources and run
+the following commands. This builds a static library <tt>libluajit.a</tt>,
+which can be linked against your game, just like the Lua library.
+</p>
+<pre class="code">
+cd src
+ps4build
+</pre>
+<p>
 You can cross-compile for <b id="xbox360">Xbox 360</b> using the
 Xbox&nbsp;360 SDK (MSVC + XEDK). Due to restrictions on consoles, the
 JIT compiler is disabled and only the fast interpreter is built.
diff --git a/doc/luajit.html b/doc/luajit.html
index 6461be3a..15c5f12e 100644
--- a/doc/luajit.html
+++ b/doc/luajit.html
@@ -160,7 +160,7 @@ LuaJIT is Copyright &copy; 2005-2014 Mike Pall, released under the
 <tr><td>Windows</td><td>Linux</td><td>BSD</td><td>OSX</td><td>POSIX</td></tr>
 </table>
 <table class="feature os os2">
-<tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td><td>PS3</td><td>Xbox 360</td></tr>
+<tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td><td>PS3</td><td>PS4</td><td>Xbox 360</td></tr>
 </table>
 <table class="feature compiler">
 <tr><td>GCC</td><td>CLANG<br>LLVM</td><td>MSVC</td></tr>