From 1eb5e8c966417f18d1ff067a7c3359e9d23c221f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 21 Apr 2013 14:09:01 +0200
Subject: [PATCH] Updated NaCl-related documentation and stuff.

---
 CMakeLists.txt   |  2 +-
 README.md        |  4 ++--
 doc/building.dox | 24 ++++++++++++++----------
 doc/mainpage.dox |  4 ++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d6f55cd4..e5d5421be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ cmake_dependent_option(WITH_TEXTURETOOLS "Build TextureTools library" ON "NOT WI
 option(WITH_MAGNUMINFO "Build magnum-info utility" ON)
 
 # Application libraries
-if(${CMAKE_SYSTEM_NAME} STREQUAL NaCl)
+if(CORRADE_TARGET_NACL)
     option(WITH_NACLAPPLICATION "Build NaClApplication library" OFF)
 else()
     option(WITH_GLXAPPLICATION "Build GlxApplication library" OFF)
diff --git a/README.md b/README.md
index 8aa48981c..292534235 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@ SUPPORTED PLATFORMS
 *   **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through
     GLUT or SDL2 toolkit)
 *   **Windows** (through GLUT or SDL2 toolkit)
-*   **Google Chrome Native Client** (natively using PPAPI, both `newlib`
-    and `glibc` toolchains are supported)
+*   **Google Chrome** (through [Native Client](https://developers.google.com/native-client/),
+    both `newlib` and `glibc` toolchains are supported)
 
 FEATURES
 ========
diff --git a/doc/building.dox b/doc/building.dox
index 621984b12..7b9132cf4 100644
--- a/doc/building.dox
+++ b/doc/building.dox
@@ -207,17 +207,21 @@ depending projects.
 You will need [Native Client SDK](https://developers.google.com/native-client/beta/sdk/download).
 Tested version is `pepper_22`.
 
-Make sure you have `toolchains` Git submodule updated, as
-@ref building-download "explained above". Don't forget to adapt `NACL_PREFIX`
-variable in `generic/NaCl-glibc-x86-32.cmake` and `generic/NaCl-glibc-x86-64.cmake`
-to path where your SDK is installed. Default is `/usr/nacl`.  You may need to
-adapt also `NACL_TOOLCHAIN_PATH` so CMake is able to find the compiler.
+Make sure you have `toolchains` submodule updated, as
+@ref building-download "explained above". You can choose from either `glibc` or
+`newlib` toolchain. `Newlib` supports only static linking, thus `BUILD_STATIC`
+is always enabled. Don't forget to adapt `NACL_PREFIX` variable in
+`generic/NaCl-*-x86-32.cmake` and `generic/NaCl-*-x86-64.cmake` to path where
+your SDK is installed. Default is `/usr/nacl`. You may need to adapt also
+`NACL_TOOLCHAIN_PATH` so CMake is able to find the compiler. NaCl currently
+supports only OpenGL ES 2, thus `TARGET_GLES` and `TARGET_GLES2` is always
+enabled.
 
 Then create build directories for x86-32 and x86-64 and run cmake and make in
-them. The toolchains needs access to its platform file, so be sure to properly
+them. The toolchains need access to its platform file, so be sure to properly
 set **absolute** path to `modules/` directory containing `Platform/NaCl.cmake`.
-Also adapt `CMAKE_INSTALL_PREFIX` to the same value you entered into toolchain
-files above.
+Also adapt `CMAKE_INSTALL_PREFIX` to the same value as in `NACL_PREFIX` in
+toolchain file.
 
     mkdir -p build-nacl-x86-32
     cd build-nacl-x86-32
@@ -243,8 +247,8 @@ files above.
 Then you can install both versions using `make install` to make them available
 for depending projects. The headers are shared by both versions.
 
-For ArchLinux there is also prepared package file in root, named
-`PKGBUILD-nacl`.
+For ArchLinux there are also prepared package files in root, named
+`PKGBUILD-nacl-glibc` and `PKGBUILD-nacl-newlib`.
 
 */
 }
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index 660d85cf6..7ed82d7d5 100644
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -68,8 +68,8 @@ namespace Magnum {
 -   **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through
     GLUT or SDL2 toolkit)
 -   **Windows** (through GLUT or SDL2 toolkit)
--   **Google Chrome Native Client** (natively using PPAPI, both `newlib`
-    and `glibc` toolchains are supported)
+-   **Google Chrome** (through [Native Client](https://developers.google.com/native-client/),
+    both `newlib` and `glibc` toolchains are supported)
 
 @section mainpage-features Features