From ac20e271730462aeb1006683a22aca2b9ab25f66 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 11 May 2012 23:11:17 +1000 Subject: CREATE_PROJECT: Updated MSVC scummvm.vcproj generation to handle coroutine compilation properly --- devtools/create_project/visualstudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools/create_project/visualstudio.cpp') diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index a0fd239db4..9bf031704e 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -144,7 +144,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std: void VisualStudioProvider::outputConfiguration(std::ostream &project, const BuildSetup &setup, const std::string &libraries, const std::string &config, const std::string &platform, const std::string &props, const bool isWin32) { project << "\t\t\n" - "\t\t\t\n" + "\t\t\t\n" "\t\t\t\n"; -- cgit v1.2.3 From 9feac7215efe42efe615ceac0c7b1cc8eb11f68c Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 20 May 2012 20:57:59 +0300 Subject: 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 --- devtools/create_project/visualstudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools/create_project/visualstudio.cpp') 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\" " : ""); -- cgit v1.2.3 From 4e0f6d346fe3c05157fa89c7881c2050e497763a Mon Sep 17 00:00:00 2001 From: Littleboy Date: Wed, 11 Jul 2012 00:43:54 -0400 Subject: CREATE_PROJECT: Properly disable Edit and Continue in Debug mode --- devtools/create_project/visualstudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools/create_project/visualstudio.cpp') 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\" " : ""); -- cgit v1.2.3