diff options
| author | Filippos Karapetis | 2012-05-20 20:57:59 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2012-05-20 20:57:59 +0300 |
| commit | 9feac7215efe42efe615ceac0c7b1cc8eb11f68c (patch) | |
| tree | b058d540034eac157ca0e49078e22a76d4cb2275 | |
| parent | 6fb9511c93393a73a7177ed5fb56c3776e5f3a23 (diff) | |
| download | scummvm-rg350-9feac7215efe42efe615ceac0c7b1cc8eb11f68c.tar.gz scummvm-rg350-9feac7215efe42efe615ceac0c7b1cc8eb11f68c.tar.bz2 scummvm-rg350-9feac7215efe42efe615ceac0c7b1cc8eb11f68c.zip | |
CREATE_PROJECT: Disable edit and continue in the scummvm project
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
| -rw-r--r-- | devtools/create_project/msbuild.cpp | 4 | ||||
| -rw-r--r-- | devtools/create_project/visualstudio.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index f8768ecc73..dfd3f1d1c7 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -235,7 +235,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s std::map<std::string, StringList>::iterator warningsIterator = _projectWarnings.find(name); // 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; 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") { project << "\t\t\t<DisableLanguageExtensions>false</DisableLanguageExtensions>\n"; } else { - if (name == "tinsel" && !isRelease) + if (name == "scummvm" && !isRelease) project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n"; if (warningsIterator != _projectWarnings.end()) diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 9bf031704e..62b30ddcd0 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -110,7 +110,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std: std::string toolConfig; toolConfig = (!warnings.empty() ? "DisableSpecificWarnings=\"" + warnings + "\"" : ""); - toolConfig += (name == "tinsel" ? "DebugInformationFormat=\"3\" " : ""); + toolConfig += (name == "scummvm" ? "DebugInformationFormat=\"3\" " : ""); toolConfig += (name == "sword25" ? "DisableLanguageExtensions=\"false\" " : ""); toolConfig += (name == "grim" ? "DisableLanguageExtensions=\"false\" " : ""); |