thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CREATE_PROJECT: Disable edit and continue in the scummvm project

Browse source 
Edit and continue is not compatible with the coroutine code. Previously,
it was disabled in the tinsel project only, but now that the coroutine
code has been moved into common, we need to disable edit and continue
in the scummvm project instead
This commit is contained in:
Filippos Karapetis 2012-05-20 20:57:59 +03:00
parent 6fb9511c93
commit 9feac7215e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
devtools/create_project/msbuild.cpp
View file

@ -235,7 +235,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
std::map<std::string, StringList>::iterator warningsIterator = _projectWarnings.find(name); std::map<std::string, StringList>::iterator warningsIterator = _projectWarnings.find(name);
// Nothing to add here, move along! // Nothing to add here, move along!
if (!setup.devTools && name != setup.projectName && name != "sword25" && name != "tinsel" && name != "grim" && warningsIterator == _projectWarnings.end()) if (!setup.devTools && name != setup.projectName && name != "sword25" && name != "scummvm" && name != "grim" && warningsIterator == _projectWarnings.end())
return; return;
std::string warnings = ""; std::string warnings = "";
@ -250,7 +250,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
if (setup.devTools || name == setup.projectName || name == "sword25" || name == "grim") { if (setup.devTools || name == setup.projectName || name == "sword25" || name == "grim") {
project << "\t\t\t<DisableLanguageExtensions>false</DisableLanguageExtensions>\n"; project << "\t\t\t<DisableLanguageExtensions>false</DisableLanguageExtensions>\n";
} else { } else {
if (name == "tinsel" && !isRelease) if (name == "scummvm" && !isRelease)
project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n"; project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n";
if (warningsIterator != _projectWarnings.end()) if (warningsIterator != _projectWarnings.end())

2
devtools/create_project/visualstudio.cpp
View file

@ -110,7 +110,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std:
std::string toolConfig; std::string toolConfig;
toolConfig = (!warnings.empty() ? "DisableSpecificWarnings=\"" + warnings + "\"" : ""); toolConfig = (!warnings.empty() ? "DisableSpecificWarnings=\"" + warnings + "\"" : "");
toolConfig += (name == "tinsel" ? "DebugInformationFormat=\"3\" " : ""); toolConfig += (name == "scummvm" ? "DebugInformationFormat=\"3\" " : "");
toolConfig += (name == "sword25" ? "DisableLanguageExtensions=\"false\" " : ""); toolConfig += (name == "sword25" ? "DisableLanguageExtensions=\"false\" " : "");
toolConfig += (name == "grim" ? "DisableLanguageExtensions=\"false\" " : ""); toolConfig += (name == "grim" ? "DisableLanguageExtensions=\"false\" " : "");