Merge branch 'master' into vulkan

This commit is contained in:
Lynix
2018-01-16 21:15:58 +01:00
375 changed files with 133309 additions and 549 deletions

View File

@@ -104,7 +104,7 @@ ACTION.Function = function ()
for arch, enabled in pairs(archEnabled) do
if (enabled) then
local archLibSrc = realLibDir .. arch .. "/"
local arch3rdPartyBinSrc = "../extlibs/lib/common/" .. arch .. "/"
local arch3rdPartyBinSrc = "../thirdparty/lib/common/" .. arch .. "/"
local archBinDst = "bin/" .. arch .. "/"
local archLibDst = "lib/" .. arch .. "/"