# premake 3.7 compatibility fixes

from patch suggested by Cilyan

This was SVN commit r7028.
This commit is contained in:
janwas 2009-07-21 17:38:27 +00:00
parent 9216c85ccc
commit 26effc4f99
3 changed files with 11 additions and 11 deletions

View File

@ -256,11 +256,11 @@ local function add_extern_lib(extern_lib, def)
-- OS X "Frameworks" need to be added in a special way to the link
-- i.e. by linkoptions += "-framework ..."
if OS == "macosx" and def.osx_frameworks then
for i,name in def.osx_frameworks do
for i,name in pairs(def.osx_frameworks) do
tinsert(package.linkoptions, "-framework " .. name)
end
else
for i,name in names do
for i,name in pairs(names) do
tinsert(package.config["Debug" ].links, name .. suffix)
-- 'Testing' config uses 'Debug' DLLs
tinsert(package.config["Testing"].links, name .. suffix)
@ -277,7 +277,7 @@ end
-- extern_libs: table of library names [string]
function package_add_extern_libs(extern_libs)
for i,extern_lib in extern_libs do
for i,extern_lib in pairs(extern_libs) do
local def = extern_lib_defs[extern_lib]
assert(def, "external library " .. extern_lib .. " not defined")

View File

@ -1,6 +1,6 @@
function sourcesfromdirs(root, dirs)
local res = {}
for i,v in dirs do
for i,v in pairs(dirs) do
local prefix
if v == "" then prefix = root..v else prefix = root..v.."/" end
local files = matchfiles(
@ -14,13 +14,13 @@ function sourcesfromdirs(root, dirs)
end
function trimrootdir(root, dirs)
for i,v in dirs do
for i,v in pairs(dirs) do
dirs[i] = strsub(v, strlen(root))
end
end
function listconcat(list, values)
for i,v in values do
for i,v in pairs(values) do
table.insert(list, v)
end
end

View File

@ -260,13 +260,13 @@ function package_add_contents(source_root, rel_source_dirs, rel_include_dirs, ex
-- (e.g. "lib/precompiled.h")
tinsert(package.includepaths, source_root)
for i,v in rel_include_dirs do
for i,v in pairs(rel_include_dirs) do
tinsert(package.includepaths, source_root .. v)
end
if extra_params["extra_files"] then
for i,v in extra_params["extra_files"] do
for i,v in pairs(extra_params["extra_files"]) do
tinsert(package.files, source_root .. v)
end
end
@ -288,7 +288,7 @@ function package_setup_pch(pch_dir, header, source)
pch_dir..source
})
end
for i,v in project.configs do
for i,v in pairs(project.configs) do
tinsert(package.config[v].defines, "USING_PCH")
end
end
@ -489,7 +489,7 @@ function setup_all_libs ()
windows = { "lib/sysdep/os/win", "lib/sysdep/os/win/wposix", "lib/sysdep/os/win/whrt" },
macosx = { "lib/sysdep/os/osx", "lib/sysdep/os/unix" },
}
for i,v in sysdep_dirs[OS] do
for i,v in pairs(sysdep_dirs[OS]) do
tinsert(source_dirs, v);
end
@ -903,7 +903,7 @@ function get_all_test_files(root, src_files, hdr_files)
-- desired */tests/* files. this is a bit slow, but hey.
local all_files = matchrecursive(root .. "*.h")
for i,v in all_files do
for i,v in pairs(all_files) do
-- header file in subdirectory test
if string.sub(v, -2) == ".h" and string.find(v, "/tests/") then
-- don't include sysdep tests on the wrong sys