Improve compatibility with VS 201x Utility projects
This commit is contained in:
parent
7158f623b9
commit
8d206735b6
@ -139,6 +139,11 @@
|
||||
--
|
||||
|
||||
m.elements.configurationProperties = function(cfg)
|
||||
if cfg.kind == p.UTILITY then
|
||||
return {
|
||||
m.configurationType,
|
||||
}
|
||||
else
|
||||
return {
|
||||
m.configurationType,
|
||||
m.useDebugLibraries,
|
||||
@ -150,6 +155,7 @@
|
||||
m.nmakeOutDirs,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
function m.configurationProperties(cfg)
|
||||
m.propertyGroup(cfg, "Configuration")
|
||||
@ -171,6 +177,13 @@
|
||||
--
|
||||
|
||||
m.elements.outputProperties = function(cfg)
|
||||
if cfg.kind == p.UTILITY then
|
||||
return {
|
||||
m.propertyGroup,
|
||||
m.outDir,
|
||||
m.intDir,
|
||||
}
|
||||
else
|
||||
return {
|
||||
m.propertyGroup,
|
||||
m.linkIncremental,
|
||||
@ -184,6 +197,7 @@
|
||||
m.generateManifest,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
function m.outputProperties(cfg)
|
||||
if not vstudio.isMakefile(cfg) then
|
||||
@ -224,6 +238,11 @@
|
||||
--
|
||||
|
||||
m.elements.itemDefinitionGroup = function(cfg)
|
||||
if cfg.kind == p.UTILITY then
|
||||
return {
|
||||
|
||||
}
|
||||
else
|
||||
return {
|
||||
m.clCompile,
|
||||
m.resourceCompile,
|
||||
@ -234,6 +253,7 @@
|
||||
m.deploy,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
function m.itemDefinitionGroup(cfg)
|
||||
if not vstudio.isMakefile(cfg) then
|
||||
|
@ -37,6 +37,7 @@
|
||||
premake.SHAREDLIB = "SharedLib"
|
||||
premake.STATICLIB = "StaticLib"
|
||||
premake.UNIVERSAL = "universal"
|
||||
premake.UTILITY = "Utility"
|
||||
premake.WINDOWEDAPP = "WindowedApp"
|
||||
premake.WINDOWS = "windows"
|
||||
premake.X32 = "x32"
|
||||
|
@ -237,8 +237,6 @@
|
||||
test.capture [[
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Utility</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
</PropertyGroup>
|
||||
]]
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user