Merge branch 'master' into vulkan

Former-commit-id: 8e5cf8f5c93203818a1939df269593f8556019f0
2016-04-23 22:57:14 +02:00
parent 16d1b83edb d1e12a6d2e
commit 4a948dfaa9
15 changed files with 252 additions and 127 deletions
--- a/build/scripts/tools/ndk.lua
+++ b/build/scripts/tools/ndk.lua
@@ -24,9 +24,10 @@ TOOL.Libraries = {
 	"NazaraCore",
 	"NazaraAudio",
 	"NazaraLua",
+	"NazaraNetwork",
 	"NazaraNoise",
 	"NazaraPhysics",
 	"NazaraUtility",
 	"NazaraRenderer",
-	"NazaraGraphics",
+	"NazaraGraphics"
 }
--- a/build/scripts/tools/ndk_server.lua
+++ b/build/scripts/tools/ndk_server.lua
@@ -38,6 +38,7 @@ TOOL.FilesExclusion = {
 TOOL.Libraries = {
 	"NazaraCore",
 	"NazaraLua",
+    "NazaraNetwork",
 	"NazaraNoise",
 	"NazaraPhysics",
 	"NazaraUtility"