diff options
| author | Johannes Schickel | 2016-03-09 18:43:52 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-03-09 22:03:47 +0100 |
| commit | 46ef80963f36b46aa7fd494b56c266f5d27cd48d (patch) | |
| tree | 2fc50a06532308c0823a41c5b0b9b7808170f443 | |
| parent | 1c2dc2f89d181edfdffa001c7055df73d0ff8e77 (diff) | |
| download | scummvm-rg350-46ef80963f36b46aa7fd494b56c266f5d27cd48d.tar.gz scummvm-rg350-46ef80963f36b46aa7fd494b56c266f5d27cd48d.tar.bz2 scummvm-rg350-46ef80963f36b46aa7fd494b56c266f5d27cd48d.zip | |
DEVTOOLS: Enable Edit&Continue on x64 for MSVC2015+.
| -rw-r--r-- | devtools/create_project/msbuild.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 8a33b6bf3b..191135fd88 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -444,9 +444,15 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t\t\t<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\n" "\t\t\t<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\n" "\t\t\t<FunctionLevelLinking>true</FunctionLevelLinking>\n" - "\t\t\t<TreatWarningAsError>false</TreatWarningAsError>\n" - "\t\t\t<DebugInformationFormat>" << (isWin32 ? "EditAndContinue" : "ProgramDatabase") << "</DebugInformationFormat>\n" // For x64 format Edit and continue is not supported, thus we default to Program Database - "\t\t\t<EnablePREfast>" << (configuration == "Analysis" ? "true" : "false") << "</EnablePREfast>\n"; + "\t\t\t<TreatWarningAsError>false</TreatWarningAsError>\n"; + if (_version >= 14) { + // Since MSVC 2015 Edit and Continue is support for x64 too. + properties << "\t\t\t<DebugInformationFormat>" << "EditAndContinue" << "</DebugInformationFormat>\n"; + } else { + // Older MSVC versions did not support Edit and Continue for x64, thus we do not use it. + properties << "\t\t\t<DebugInformationFormat>" << (isWin32 ? "EditAndContinue" : "ProgramDatabase") << "</DebugInformationFormat>\n"; + } + properties << "\t\t\t<EnablePREfast>" << (configuration == "Analysis" ? "true" : "false") << "</EnablePREfast>\n"; if (configuration == "LLVM") { // FIXME The LLVM cl wrapper does not seem to work properly with the $(TargetDir) path so we hard-code the build folder until the issue is resolved |