diff options
| -rw-r--r-- | src/actions/vstudio/vs2010_vcxproj.lua | 14 | ||||
| -rw-r--r-- | tests/actions/vstudio/vc2010/test_mfc.lua | 6 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua index b805389..bc7bd2e 100644 --- a/src/actions/vstudio/vs2010_vcxproj.lua +++ b/src/actions/vstudio/vs2010_vcxproj.lua @@ -72,9 +72,9 @@ -- kind of binary it produces, and some global settings. -- - function vc2010.configurationPropertyGroup(cfg) + function vc2010.configurationPropertyGroup(cfg, cfginfo) _p(1,'<PropertyGroup '..if_config_and_platform() ..' Label="Configuration">' - , premake.esc(cfg.name)) + , premake.esc(cfginfo.name)) _p(2,'<ConfigurationType>%s</ConfigurationType>',vc2010.config_type(cfg)) _p(2,'<UseDebugLibraries>%s</UseDebugLibraries>', iif(optimisation(cfg) == "Disabled","true","false")) _p(2,'<CharacterSet>%s</CharacterSet>',iif(cfg.flags.Unicode,"Unicode","MultiByte")) @@ -90,14 +90,6 @@ end - local function config_type_block(prj) - for _, cfginfo in ipairs(prj.solution.vstudio_configs) do - local cfg = premake.getconfig(prj, cfginfo.src_buildcfg, cfginfo.src_platform) - vc2010.configurationPropertyGroup(cfg) - end - end - - local function import_props(prj) for _, cfginfo in ipairs(prj.solution.vstudio_configs) do local cfg = premake.getconfig(prj, cfginfo.src_buildcfg, cfginfo.src_platform) @@ -579,7 +571,7 @@ for _, cfginfo in ipairs(prj.solution.vstudio_configs) do local cfg = premake.getconfig(prj, cfginfo.src_buildcfg, cfginfo.src_platform) - vc2010.configurationPropertyGroup(cfg) + vc2010.configurationPropertyGroup(cfg, cfginfo) end _p(1,'<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.props" />') diff --git a/tests/actions/vstudio/vc2010/test_mfc.lua b/tests/actions/vstudio/vc2010/test_mfc.lua index 6a8555d..1ada158 100644 --- a/tests/actions/vstudio/vc2010/test_mfc.lua +++ b/tests/actions/vstudio/vc2010/test_mfc.lua @@ -24,7 +24,7 @@ premake.bake.buildconfigs() sln.vstudio_configs = premake.vstudio.buildconfigs(sln) cfg = premake.getconfig(prj, "Debug", platform) - vc2010.configurationPropertyGroup(cfg) + vc2010.configurationPropertyGroup(cfg, sln.vstudio_configs[1]) end @@ -37,7 +37,7 @@ flags { "MFC" } prepare() test.capture [[ - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> @@ -50,7 +50,7 @@ flags { "MFC", "StaticRuntime" } prepare() test.capture [[ - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> |