diff options
Diffstat (limited to 'src/actions/vstudio/vs200x_vcproj.tmpl')
| -rw-r--r-- | src/actions/vstudio/vs200x_vcproj.tmpl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/actions/vstudio/vs200x_vcproj.tmpl b/src/actions/vstudio/vs200x_vcproj.tmpl index bda2a66..daf99fc 100644 --- a/src/actions/vstudio/vs200x_vcproj.tmpl +++ b/src/actions/vstudio/vs200x_vcproj.tmpl @@ -29,11 +29,10 @@ <% end %>
<Configurations>
<% for cfg in premake.eachconfig(this) do %>
- <% local target = premake.gettargetfile(cfg, "target", "windows") %>
<Configuration
Name="<%= premake.esc(cfg.name) %>|Win32"
- OutputDirectory="<%= premake.esc(path.translate(path.getdirectory(target), "\\")) %>"
- IntermediateDirectory="<%= premake.esc(path.translate(premake.getobjdir(cfg), "\\")) %>"
+ OutputDirectory="<%= premake.esc(cfg.buildtarget.directory) %>"
+ IntermediateDirectory="<%= premake.esc(cfg.objectsdir) %>"
ConfigurationType="<%= _VS.cfgtype(cfg) %>"
CharacterSet="<%= iif(cfg.flags.Unicode, 1, 2) %>"
<% if cfg.flags.Managed then %>
@@ -133,11 +132,11 @@ AdditionalOptions="<%= table.concat(premake.esc(cfg.linkoptions), " ") %>"
<% end %>
<% if #cfg.links > 0 then %>
- AdditionalDependencies="<%= table.concat(premake.getlibraries(cfg), " ") %>"
+ AdditionalDependencies="<%= table.concat(premake.getlinks(cfg, "all", "fullpath"), " ") %>"
<% end %>
- OutputFile="$(OutDir)\<%= path.getname(target) %>"
+ OutputFile="$(OutDir)\<%= cfg.buildtarget.name %>"
LinkIncremental="<%= iif(_VS.optimization(cfg) == 0, 2, 1) %>"
- AdditionalLibraryDirectories="<%= table.concat(premake.esc(cfg.libdirs) , ";") %>"
+ AdditionalLibraryDirectories="<%= table.concat(premake.esc(path.translate(cfg.libdirs)) , ";") %>"
<% local deffile = premake.findfile(cfg, ".def"); if deffile then %>
ModuleDefinitionFile="<%= deffile %>"
<% end %>
@@ -157,12 +156,13 @@ EntryPointSymbol="mainCRTStartup"
<% end %>
<% if cfg.kind == "SharedLib" then %>
- ImportLibrary="<%= path.translate(_VS.importlibfile(cfg), "\\") %>"
+ <% local implibname = path.translate(premake.gettarget(cfg, "link", "windows").fullpath, "\\") %>
+ ImportLibrary="<%= iif(cfg.flags.NoImportLib, cfg.objectsdir.."\\"..path.getname(implibname), implibname) %>"
<% end %>
TargetMachine="1"
<% else %>
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\\<%= path.getname(target) %>"
+ OutputFile="$(OutDir)\<%= cfg.buildtarget.name %>"
<% end %>
/>
<% elseif (block == "VCManagedResourceCompilerTool") then %>
|