diff options
| author | Littleboy | 2012-07-11 00:43:54 -0400 |
|---|---|---|
| committer | Littleboy | 2012-07-14 12:22:09 -0400 |
| commit | 4e0f6d346fe3c05157fa89c7881c2050e497763a (patch) | |
| tree | 1f864e5432ddd943836d9a2fe2ab6e3ebd067370 | |
| parent | 0c84dc1ec94771e5bb4ea68049b0cd94d86fb789 (diff) | |
| download | scummvm-rg350-4e0f6d346fe3c05157fa89c7881c2050e497763a.tar.gz scummvm-rg350-4e0f6d346fe3c05157fa89c7881c2050e497763a.tar.bz2 scummvm-rg350-4e0f6d346fe3c05157fa89c7881c2050e497763a.zip | |
CREATE_PROJECT: Properly disable Edit and Continue in Debug mode
| -rw-r--r-- | devtools/create_project/msbuild.cpp | 8 | ||||
| -rw-r--r-- | devtools/create_project/visualstudio.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index dfd3f1d1c7..a82140c2d3 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -249,11 +249,11 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s // Compile configuration if (setup.devTools || name == setup.projectName || name == "sword25" || name == "grim") { project << "\t\t\t<DisableLanguageExtensions>false</DisableLanguageExtensions>\n"; - } else { - if (name == "scummvm" && !isRelease) - project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n"; - if (warningsIterator != _projectWarnings.end()) + if (name == setup.projectName && !isRelease) + project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n"; + } else { + if (warningsIterator != _projectWarnings.end()) project << "\t\t\t<DisableSpecificWarnings>" << warnings << ";%(DisableSpecificWarnings)</DisableSpecificWarnings>\n"; } diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 62b30ddcd0..c301e78ad1 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 == "scummvm" ? "DebugInformationFormat=\"3\" " : ""); + toolConfig += (name == setup.projectName ? "DebugInformationFormat=\"3\" " : ""); toolConfig += (name == "sword25" ? "DisableLanguageExtensions=\"false\" " : ""); toolConfig += (name == "grim" ? "DisableLanguageExtensions=\"false\" " : ""); |