| @@ -167,7 +167,10 @@ public: | |||||
| setValueIfVoid (getPluginBinaryCopyStepEnabledValue(), false); | setValueIfVoid (getPluginBinaryCopyStepEnabledValue(), false); | ||||
| if (! isDebug()) | if (! isDebug()) | ||||
| { | |||||
| updateOldLTOSetting(); | updateOldLTOSetting(); | ||||
| setValueIfVoid (getLinkTimeOptimisationEnabledValue(), true); | |||||
| } | |||||
| initialisePluginCachedValues(); | initialisePluginCachedValues(); | ||||
| } | } | ||||
| @@ -334,7 +337,8 @@ public: | |||||
| //============================================================================== | //============================================================================== | ||||
| void updateOldLTOSetting() | void updateOldLTOSetting() | ||||
| { | { | ||||
| getLinkTimeOptimisationEnabledValue() = (static_cast<int> (config ["wholeProgramOptimisation"]) == 0); | |||||
| if (config.getPropertyAsValue ("wholeProgramOptimisation", nullptr) != Value()) | |||||
| getLinkTimeOptimisationEnabledValue() = (static_cast<int> (config ["wholeProgramOptimisation"]) == 0); | |||||
| } | } | ||||
| void addVisualStudioPluginInstallPathProperties (PropertyListBuilder& props) | void addVisualStudioPluginInstallPathProperties (PropertyListBuilder& props) | ||||
| @@ -441,15 +445,14 @@ public: | |||||
| e->setAttribute ("Label", "Configuration"); | e->setAttribute ("Label", "Configuration"); | ||||
| e->createNewChildElement ("ConfigurationType")->addTextElement (getProjectType()); | e->createNewChildElement ("ConfigurationType")->addTextElement (getProjectType()); | ||||
| e->createNewChildElement ("UseOfMfc")->addTextElement ("false"); | e->createNewChildElement ("UseOfMfc")->addTextElement ("false"); | ||||
| e->createNewChildElement ("WholeProgramOptimization")->addTextElement (config.isLinkTimeOptimisationEnabled() ? "true" | |||||
| : "false"); | |||||
| const String charSet (config.getCharacterSet()); | const String charSet (config.getCharacterSet()); | ||||
| if (charSet.isNotEmpty()) | if (charSet.isNotEmpty()) | ||||
| e->createNewChildElement ("CharacterSet")->addTextElement (charSet); | e->createNewChildElement ("CharacterSet")->addTextElement (charSet); | ||||
| if (config.isLinkTimeOptimisationEnabled()) | |||||
| e->createNewChildElement ("WholeProgramOptimization")->addTextElement ("true"); | |||||
| if (config.shouldLinkIncremental()) | if (config.shouldLinkIncremental()) | ||||
| e->createNewChildElement ("LinkIncremental")->addTextElement ("true"); | e->createNewChildElement ("LinkIncremental")->addTextElement ("true"); | ||||