diff --git a/modules/vstudio/vs2010_vcxproj.lua b/modules/vstudio/vs2010_vcxproj.lua index 913e34be8e..020e0af8df 100644 --- a/modules/vstudio/vs2010_vcxproj.lua +++ b/modules/vstudio/vs2010_vcxproj.lua @@ -675,6 +675,7 @@ m.fullProgramDatabaseFile, m.generateDebugInformation, m.optimizeReferences, + m.LinkTimeCodeGeneration, } else return { @@ -682,6 +683,7 @@ m.fullProgramDatabaseFile, m.generateDebugInformation, m.optimizeReferences, + m.LinkTimeCodeGeneration, m.additionalDependencies, m.additionalLibraryDirectories, m.importLibrary, @@ -2727,6 +2729,11 @@ end end + function m.LinkTimeCodeGeneration(cfg) + if cfg.flags.LinkTimeOptimization then + m.element("LinkTimeCodeGeneration", nil, "UseLinkTimeCodeGeneration") + end + end function m.optimization(cfg, condition) local map = { Off="Disabled", On="Full", Debug="Disabled", Full="Full", Size="MinSpace", Speed="MaxSpeed" } diff --git a/src/base/config.lua b/src/base/config.lua index b76645cd20..1c00274ba6 100755 --- a/src/base/config.lua +++ b/src/base/config.lua @@ -152,7 +152,8 @@ function config.canLinkIncremental(cfg) if cfg.kind == "StaticLib" or config.isOptimizedBuild(cfg) - or cfg.flags.NoIncrementalLink then + or cfg.flags.NoIncrementalLink + or cfg.flags.LinkTimeOptimization then return false end return true