From 5db71608cbe3772694295644278563d654a76509 Mon Sep 17 00:00:00 2001
From: bkaradzic <branimirkaradzic@gmail.com>
Date: Sat, 18 May 2013 15:28:35 -0700
Subject: [PATCH] Updated PNacl build.

---
 README.md            |  7 ++++---
 premake/premake4.lua | 15 +++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e39eedef0..5376453f8 100644
--- a/README.md
+++ b/README.md
@@ -69,12 +69,12 @@ Download AndroidNDK from:
 
 	sudo apt-get install libgl1-mesa-dev
 
-### Prerequisites for Native Client (Pepper 22) on Windows
+### Prerequisites for Native Client on Windows
 
 Download Native Client SDK from:  
 [https://developers.google.com/native-client/sdk/download](https://developers.google.com/native-client/sdk/download)
 
-	setx NACL <path to Native Client SDK directory>\toolchain\win_x86_newlib
+	setx NACL_SDK_ROOT <path to Native Client SDK directory>
 
 ### Prerequisites for Windows
 
@@ -115,7 +115,8 @@ Other platforms:
 
 Configuration is `<platform>-<debug/release>[32/64]`. For example:
 
-	linux-release32, nacl-debug64, android-release, etc.
+	linux-release32, nacl-debug64, nacl-arm-debug, pnacl-release, 
+	android-release, etc.
 
 Examples
 --------
diff --git a/premake/premake4.lua b/premake/premake4.lua
index 1c1bdde57..5053a62d0 100644
--- a/premake/premake4.lua
+++ b/premake/premake4.lua
@@ -67,10 +67,8 @@ function exampleProject(_name, _uuid)
 			"GLESv2",
 		}
 
-	configuration { "emscripten" }
-		targetextension ".bc"
-
-	configuration { "nacl or nacl-arm or pnacl" }
+	configuration { "nacl or nacl-arm" }
+		kind "ConsoleApp"
 		targetextension ".nexe"
 		links {
 			"ppapi",
@@ -78,6 +76,15 @@ function exampleProject(_name, _uuid)
 			"pthread",
 		}
 
+	configuration { "pnacl" }
+		kind "ConsoleApp"
+		targetextension ".pexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
+
 	configuration { "linux" }
 		links {
 			"X11",