Merge branch 'master' into vulkan

2016-12-06 16:46:24 +01:00
parent e0935edd00 e66e0dfdce
commit 2217cf9661
129 changed files with 7831 additions and 2689 deletions
--- a/build/scripts/actions/generateheaders.lua
+++ b/build/scripts/actions/generateheaders.lua
@@ -69,6 +69,15 @@ ACTION.Function = function ()
 		Target = "../SDK/include/NDK/Systems.hpp"
 	})
 	
+	table.insert(paths, {
+		Excludes = {},
+		HeaderGuard = "NDK_WIDGETS_GLOBAL_HPP",
+		Name = "NDK Widgets",
+		SearchDir = "../SDK/include/NDK/Widgets", 
+		TopDir = "NDK", 
+		Target = "../SDK/include/NDK/Widgets.hpp"
+	})
+	
 	for k,v in ipairs(paths) do
 		print(v.Name)
 		local header, err = io.open(v.Target, "w+")