diff options
| author | Jason Perkins <starkos@industriousone.com> | 2014-01-08 20:22:49 +0400 |
|---|---|---|
| committer | Jason Perkins <starkos@industriousone.com> | 2014-01-08 20:22:49 +0400 |
| commit | a18194bfdaed09e32074c012df59903582fd006a (patch) | |
| tree | 8242350e85d8c2996910f32ab645ab3bcb859b97 | |
| parent | e4aed44c8277274aa99d2fa02db6ffe5034defbb (diff) | |
| parent | d32485d3764b59e63febc0fec3b5291532926ae7 (diff) | |
Merged in windirstat/premake-stable/sln2proj_map_override_for_merge (pull request #32)
Allowing the mapping between the global solution configuration and the project configurations to be overridden
| -rw-r--r-- | src/actions/vstudio/vs2005_solution.lua | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/actions/vstudio/vs2005_solution.lua b/src/actions/vstudio/vs2005_solution.lua index d5b0298..77928d8 100644 --- a/src/actions/vstudio/vs2005_solution.lua +++ b/src/actions/vstudio/vs2005_solution.lua @@ -86,7 +86,16 @@ _p('\tEndGlobalSection') end +-- +-- Write a single solution to project mapping (ActiveCfg and Build.0 lines) +-- + function sln2005.project_platforms_sln2prj_mapping(sln, prj, cfg, mapped) + _p('\t\t{%s}.%s.ActiveCfg = %s|%s', prj.uuid, cfg.name, cfg.buildcfg, mapped) + if mapped == cfg.platform or cfg.platform == "Mixed Platforms" then + _p('\t\t{%s}.%s.Build.0 = %s|%s', prj.uuid, cfg.name, cfg.buildcfg, mapped) + end + end -- -- Write out the contents of the ProjectConfigurationPlatforms section, which maps @@ -111,11 +120,7 @@ mapped = cfg.platform end end - - _p('\t\t{%s}.%s.ActiveCfg = %s|%s', prj.uuid, cfg.name, cfg.buildcfg, mapped) - if mapped == cfg.platform or cfg.platform == "Mixed Platforms" then - _p('\t\t{%s}.%s.Build.0 = %s|%s', prj.uuid, cfg.name, cfg.buildcfg, mapped) - end + sln2005.project_platforms_sln2prj_mapping(sln, prj, cfg, mapped) end end _p('\tEndGlobalSection') |