Merge branch 'master' into vulkan

build/scripts/actions/encodesresources.lua

@@ -5,8 +5,14 @@ ACTION.Function = function ()
 	print("Encoding resources ...")
 	local startClock = os.clock()
 	local modules = os.matchdirs("../src/Nazara/*")
+	table.insert(modules, "../SDK/src/NDK")
 	for k, modulePath in pairs(modules) do
-		local moduleName = modulePath:sub(15, -1)
+		local moduleName
+		if (modulePath:sub(4, 6) == "src") then
+			moduleName = modulePath:sub(15, -1)
+		else
+			moduleName = "SDK"
+		end
 		local files = os.matchfiles(modulePath .. "/Resources/**")
 		for k, filePath in pairs(files) do
 			if (filePath:sub(-2) ~= ".h") then

build/scripts/actions/package.lua

@@ -84,13 +84,13 @@ ACTION.Function = function ()
 	local libFileMasks
 	local exeFileExt
 	local exeFilterFunc
-	if (os.is("windows")) then	
+	if (os.ishost("windows")) then	
 		binFileMasks = {"**.dll", "**.pdb"}
 		libFileMasks = {"**.lib", "**.a"}
 		exeFileExt = ".exe"
 		exeFilterFunc = function (filePath) return true end
 	else
-		if (os.is("macosx")) then
+		if (os.ishost("macosx")) then
 			binFileMasks = {"**.dynlib"}
 		else
 			binFileMasks = {"**.so"}
@@ -183,14 +183,7 @@ ACTION.Function = function ()
 				end
 			end
 
-			local ok, err
-			if (os.is("windows")) then
-				ok, err = os.copyfile(v, targetPath)
-			else
-				-- Workaround: As premake is translating this to "cp %s %s", it fails if space are presents in source/destination paths.
-				ok, err = os.copyfile(string.format("\"%s\"", v), string.format("\"%s\"", targetPath))
-			end
-
+			local ok, err = os.copyfile(v, targetPath)
 			if (not ok) then
 				print("Failed to copy \"" .. v .. "\" to \"" .. targetPath .. "\": " .. err)
 			end
@@ -203,5 +196,5 @@ ACTION.Function = function ()
 	end
 	
 	local config = libDir .. " - " .. enabledArchs
-	print(string.format("Package successfully created at \"%s\" (%u MB, %s)", packageDir, size / (1024 * 1024), config))
+	print(string.format("Package successfully created at \"%s\" (%u MB, %s)", packageDir, size // (1024 * 1024), config))
 end