applies miminal rebuild change to vs10 that was applied in changeset 0b3e27b8eac6 for vs200x

This commit is contained in:
liamDevine 2010-10-31 23:56:07 +00:00
parent 6c7968aba6
commit 420e381d47
2 changed files with 30 additions and 31 deletions

View File

@ -241,24 +241,6 @@ local vs10_helpers = premake.vstudio.vs10_helpers
end
end
--have a look at this and translate
--
--function vs10_vcxproj_symbols(cfg)
-- if (not cfg.flags.Symbols) then
-- return 0
-- else
-- Edit-and-continue does't work for some configurations
-- if cfg.flags.NoEditAndContinue or
-- _VS.optimization(cfg) ~= 0 or
-- cfg.flags.Managed or
-- cfg.platform == "x64" then
-- return 3
-- else
-- return 4
-- end
-- end
--end
--
local function preprocessor(indent,cfg)
if #cfg.defines > 0 then
_p(indent,'<PreprocessorDefinitions>%s;%%(PreprocessorDefinitions)</PreprocessorDefinitions>'
@ -321,7 +303,24 @@ local vs10_helpers = premake.vstudio.vs10_helpers
end
end
--have a look at this and translate
--
--function vs10_vcxproj_symbols(cfg)
-- if (not cfg.flags.Symbols) then
-- return 0
-- else
-- Edit-and-continue does't work for some configurations
-- if cfg.flags.NoEditAndContinue or
-- _VS.optimization(cfg) ~= 0 or
-- cfg.flags.Managed or
-- cfg.platform == "x64" then
-- return 3
-- else
-- return 4
-- end
-- end
--end
--
local function debug_info(cfg)
--
-- EditAndContinue /ZI
@ -336,9 +335,9 @@ local vs10_helpers = premake.vstudio.vs10_helpers
end
local function minimal_build(cfg)
if cfg.flags.Symbols and not cfg.flags.NoMinimalRebuild then
if premake.config.isdebugbuild(cfg) and not cfg.flags.NoMinimalRebuild then
_p(3,'<MinimalRebuild>true</MinimalRebuild>')
elseif cfg.flags.Symbols then
else
_p(3,'<MinimalRebuild>false</MinimalRebuild>')
end
end

View File

@ -177,27 +177,27 @@ function vs10_flags.unicode_characterSet_setToUnicode()
end
function vs10_flags.noMinimalRebuildYetNotSymbols_minimalRebuild_isNotFound()
flags {"NoMinimalRebuild"}
local buffer = get_buffer()
test.string_does_not_contain(buffer,'MinimalRebuild')
end
function vs10_flags.noMinimalRebuildAndSymbols_minimalRebuild_setToFalse()
flags {"NoMinimalRebuild","Symbols"}
function vs10_flags.debugAndNoMinimalRebuildAndSymbols_minimalRebuild_setToFalse()
flags {debug_string,"NoMinimalRebuild"}
local buffer = get_buffer()
test.string_contains(buffer,'<MinimalRebuild>false</MinimalRebuild>')
end
function vs10_flags.symbolsSetYetNotMinimalRebuild_minimalRebuild_setToTrue()
flags {"Symbols"}
function vs10_flags.debugYetNotMinimalRebuild_minimalRebuild_setToTrue()
flags {debug_string}
local buffer = get_buffer()
test.string_contains(buffer,'<MinimalRebuild>true</MinimalRebuild>')
end
function vs10_flags.release_minimalRebuild_setToFalse()
flags {release_string}
local buffer = get_buffer()
test.string_contains(buffer,'<MinimalRebuild>false</MinimalRebuild>')
end
function vs10_flags.mfc_useOfMfc_setToStatic()
flags{"MFC"}