Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/windirstat/premake-4.x-stable.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliamDevine <none@none>2010-07-28 04:25:07 +0400
committerliamDevine <none@none>2010-07-28 04:25:07 +0400
commitf4eae5fe6bac26fb7b1d3f1274d583ab2353f8bf (patch)
treeb97a20c2180e02636f33ae1b7b57bcf0a9c612dd /src/actions
parentbb77b3a90251e5ba399f8f931bffbc542b703c10 (diff)
linkoptions added and refactored for all "kinds"
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/vstudio/vs2010_vcxproxj.lua13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/actions/vstudio/vs2010_vcxproxj.lua b/src/actions/vstudio/vs2010_vcxproxj.lua
index 7837527..4a1bfc8 100644
--- a/src/actions/vstudio/vs2010_vcxproxj.lua
+++ b/src/actions/vstudio/vs2010_vcxproxj.lua
@@ -438,11 +438,19 @@ local vs10_helpers = premake.vstudio.vs10_helpers
_p(2,'</PreLinkEvent>')
end
end
-
+
+ local function additional_options(indent,cfg)
+ if #cfg.linkoptions > 0 then
+ _p(indent,'<AdditionalOptions>%s %%(AdditionalOptions)</AdditionalOptions>',
+ table.concat(premake.esc(cfg.linkoptions), " "))
+ end
+ end
+
local function item_def_lib(cfg)
if cfg.kind == 'StaticLib' then
_p(1,'<Lib>')
_p(2,'<OutputFile>$(OutDir)%s</OutputFile>',cfg.buildtarget.name)
+ additional_options(2,cfg)
_p(1,'</Lib>')
end
end
@@ -507,7 +515,8 @@ local vs10_helpers = premake.vstudio.vs10_helpers
import_lib(cfg)
_p(3,'<TargetMachine>%s</TargetMachine>', iif(cfg.platform == "x64", "MachineX64", "MachineX86"))
-
+
+ additional_options(3,cfg)
else
common_link_section(cfg)
end