diff options
| author | Oliver Schneider <oliver@assarbad.net> | 2022-02-27 04:07:42 +0300 |
|---|---|---|
| committer | Oliver Schneider <oliver@assarbad.net> | 2022-02-27 04:07:42 +0300 |
| commit | ec945dcfb3116421ba196476355c364f1405617d (patch) | |
| tree | 088f9e6f670bf3c8289147b4571fef053ae2a715 /src/actions | |
| parent | 68abe9eb99e5d8aec6a5dacfd8859a5bb01dce0b (diff) | |
Trying to align output better with vanilla VS output4.4-wds-877
Added tests for some VS versions that weren't currently tested
--HG--
branch : WDS-build
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/vstudio/_vstudio.lua | 3 | ||||
| -rw-r--r-- | src/actions/vstudio/vs2005_csproj.lua | 17 | ||||
| -rw-r--r-- | src/actions/vstudio/vs2010_vcxproj.lua | 15 |
3 files changed, 32 insertions, 3 deletions
diff --git a/src/actions/vstudio/_vstudio.lua b/src/actions/vstudio/_vstudio.lua index d0b75d4..46acb94 100644 --- a/src/actions/vstudio/_vstudio.lua +++ b/src/actions/vstudio/_vstudio.lua @@ -22,6 +22,9 @@ x64 = "x64", PS3 = "PS3", Xbox360 = "Xbox 360", + Itanium = "Itanium", + ARM = "ARM", + ARM64 = "ARM64", } diff --git a/src/actions/vstudio/vs2005_csproj.lua b/src/actions/vstudio/vs2005_csproj.lua index 37258e2..b7d4bbf 100644 --- a/src/actions/vstudio/vs2005_csproj.lua +++ b/src/actions/vstudio/vs2005_csproj.lua @@ -207,6 +207,23 @@ end
end
+--
+-- Write the build events groups.
+--
+
+ function cs2005.buildevents(cfg)
+ if #cfg.prebuildcommands > 0 then
+ _p(' <PropertyGroup>')
+ _p(' <PreBuildEvent>%s</PreBuildEvent>', premake.esc(table.implode(cfg.prebuildcommands, "", "", "\r\n")))
+ _p(' </PropertyGroup>')
+ end
+ if #cfg.postbuildcommands > 0 then
+ _p(' <PropertyGroup>')
+ _p(' <PostBuildEvent>%s</PostBuildEvent>', premake.esc(table.implode(cfg.postbuildcommands, "", "", "\r\n")))
+ _p(' </PropertyGroup>')
+ end
+ end
+
--
-- The main function: write the project file.
diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua index 04deecd..0a6c4bc 100644 --- a/src/actions/vstudio/vs2010_vcxproj.lua +++ b/src/actions/vstudio/vs2010_vcxproj.lua @@ -576,12 +576,21 @@ io.eol = "\r\n" _p('<?xml version="1.0" encoding="utf-8"?>') - local t = "" + local action = premake.action.current() + + local toolversion = '' + if (_ACTION >= "vs2010") and (_ACTION <= "vs2017") then + if action.vstudio.toolsVersion then + toolversion = string.format(' ToolsVersion="%s"', action.vstudio.toolsVersion) + end + end + + local default_targets = "" if targets then - t = ' DefaultTargets="' .. targets .. '"' + default_targets = ' DefaultTargets="' .. targets .. '"' end - _p('<Project%s ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">', t) + _p('<Project%s%s xmlns="http://schemas.microsoft.com/developer/msbuild/2003">', default_targets, toolversion) end |