AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Bug 2910691: Duplicate build options

Browse Source
This commit is contained in:
starkos 2009-12-08 21:28:52 +00:00
parent 6a323fc263
commit b3abe4c0cb
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -9,6 +9,7 @@
- Added os.executef() - Added os.executef()
- Bug 2909463: Fix Xcode handling of Obj-C++ .mm files - Bug 2909463: Fix Xcode handling of Obj-C++ .mm files
- Bug 2903430: Using relative instead of absolute paths with $() macro - Bug 2903430: Using relative instead of absolute paths with $() macro
- Bug 2910691: Duplicate build options
------- -------

10
src/base/configs.lua
View File

@ -158,7 +158,15 @@
for field, value in pairs(src) do for field, value in pairs(src) do
if not nocopy[field] then if not nocopy[field] then
if type(value) == "table" then if type(value) == "table" then
dest[field] = table.join(dest[field] or {}, value) -- merge two lists, removing any duplicates along the way
local tbl = dest[field] or { }
for _, item in ipairs(value) do
if not tbl[item] then
table.insert(tbl, item)
tbl[item] = item
end
end
dest[field] = tbl
else else
dest[field] = value dest[field] = value
end end