diff --git a/makefile b/makefile
index a91e37cb3..02c6764bb 100755
--- a/makefile
+++ b/makefile
@@ -7,6 +7,7 @@ all:
 	premake --file=premake/premake4.lua vs2008
 	premake --file=premake/premake4.lua vs2010
 	premake --file=premake/premake4.lua --gcc=nacl gmake
+	premake --file=premake/premake4.lua --gcc=nacl-arm gmake
 	premake --file=premake/premake4.lua --gcc=pnacl gmake
 	premake --file=premake/premake4.lua --gcc=mingw gmake
 	premake --file=premake/premake4.lua --gcc=linux gmake
@@ -55,10 +56,17 @@ nacl-release64:
 	make -R -C .build/projects/gmake-nacl config=release64
 nacl: nacl-debug32 nacl-release32 nacl-debug64 nacl-release64
 
+nacl-arm-debug32:
+	make -R -C .build/projects/gmake-nacl-arm config=debug32
+nacl-arm-release32:
+	make -R -C .build/projects/gmake-nacl-arm config=release32
+nacl-arm: nacl-arm-debug32 nacl-arm-release32
+
 pnacl-debug:
 	make -R -C .build/projects/gmake-pnacl config=debug64
 pnacl-release:
 	make -R -C .build/projects/gmake-pnacl config=release64
+pnacl: pnacl-debug pnacl-release
 
 osx-debug32:
 	make -C .build/projects/gmake-osx config=debug32
diff --git a/premake/example-00-helloworld.lua b/premake/example-00-helloworld.lua
index 97e2cefbc..79dffca85 100755
--- a/premake/example-00-helloworld.lua
+++ b/premake/example-00-helloworld.lua
@@ -21,8 +21,13 @@ project "example-00-helloworld"
 	configuration { "emscripten" }
 		targetextension ".bc"
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-01-cubes.lua b/premake/example-01-cubes.lua
index 504e45724..6dd65c40d 100755
--- a/premake/example-01-cubes.lua
+++ b/premake/example-01-cubes.lua
@@ -23,8 +23,13 @@ project "example-01-cubes"
 	configuration { "emscripten" }
 		targetextension ".bc"
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-02-metaballs.lua b/premake/example-02-metaballs.lua
index 2d812bad2..fe72eb7b9 100755
--- a/premake/example-02-metaballs.lua
+++ b/premake/example-02-metaballs.lua
@@ -23,8 +23,13 @@ project "example-02-metaballs"
 	configuration { "emscripten" }
 		targetextension ".bc"
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-03-raymarch.lua b/premake/example-03-raymarch.lua
index 51b432ac2..063580795 100755
--- a/premake/example-03-raymarch.lua
+++ b/premake/example-03-raymarch.lua
@@ -23,8 +23,13 @@ project "example-03-raymarch"
 	configuration { "emscripten" }
 		targetextension ".bc"
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-04-mesh.lua b/premake/example-04-mesh.lua
index 6f3914ed1..4686dba52 100755
--- a/premake/example-04-mesh.lua
+++ b/premake/example-04-mesh.lua
@@ -23,8 +23,13 @@ project "example-04-mesh"
 	configuration { "emscripten" }
 		targetextension ".bc"
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-05-instancing.lua b/premake/example-05-instancing.lua
index e5ef108bf..ce08a9ba2 100755
--- a/premake/example-05-instancing.lua
+++ b/premake/example-05-instancing.lua
@@ -23,8 +23,13 @@ project "example-05-instancing"
 	configuration { "emscripten" }
 		targetextension ".bc"
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-06-bump.lua b/premake/example-06-bump.lua
index 4a0caa3a9..6c7043814 100755
--- a/premake/example-06-bump.lua
+++ b/premake/example-06-bump.lua
@@ -20,8 +20,13 @@ project "example-06-bump"
 		"bgfx",
 	}
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-07-callback.lua b/premake/example-07-callback.lua
index ce95bfaef..756ed5e2f 100755
--- a/premake/example-07-callback.lua
+++ b/premake/example-07-callback.lua
@@ -20,8 +20,13 @@ project "example-07-callback"
 		"bgfx",
 	}
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/example-08-update.lua b/premake/example-08-update.lua
index 49dc43687..3abdb5622 100755
--- a/premake/example-08-update.lua
+++ b/premake/example-08-update.lua
@@ -23,8 +23,13 @@ project "example-08-update"
 	configuration { "emscripten" }
 		targetextension ".bc"
 
-	configuration { "nacl" }
+	configuration { "nacl or nacl-arm or pnacl" }
 		targetextension ".nexe"
+		links {
+			"ppapi",
+			"ppapi_gles2",
+			"pthread",
+		}
 
 	configuration { "nacl", "Release" }
 		postbuildcommands {
diff --git a/premake/premake4.lua b/premake/premake4.lua
index 655d2842d..b2bb0834a 100644
--- a/premake/premake4.lua
+++ b/premake/premake4.lua
@@ -29,10 +29,6 @@ function copyLib()
 end
 
 dofile "bgfx.lua"
-dofile "makedisttex.lua"
-dofile "shaderc.lua"
-dofile "texturec.lua"
-dofile "geometryc.lua"
 dofile "example-00-helloworld.lua"
 dofile "example-01-cubes.lua"
 dofile "example-02-metaballs.lua"
@@ -42,3 +38,7 @@ dofile "example-05-instancing.lua"
 dofile "example-06-bump.lua"
 dofile "example-07-callback.lua"
 dofile "example-08-update.lua"
+dofile "makedisttex.lua"
+dofile "shaderc.lua"
+dofile "texturec.lua"
+dofile "geometryc.lua"