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/msbuild.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'devtools/create_project/msbuild.cpp')

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";
 	}
 
-- 
cgit v1.2.3


From d86c0a44f8452261e7d1e330edf2449642b056fd Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Wed, 11 Jul 2012 01:08:22 -0400
Subject: CREATE_PROJECT: Add support for Visual Studio 2012 project creation

---
 devtools/create_project/msbuild.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'devtools/create_project/msbuild.cpp')

diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index a82140c2d3..90a5e3c15b 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -46,7 +46,13 @@ const char *MSBuildProvider::getPropertiesExtension() {
 }
 
 int MSBuildProvider::getVisualStudioVersion() {
-	return 2010;
+	if (_version == 10)
+		return 2010;
+
+	if (_version == 11)
+		return 2012;
+
+	error("Unsupported version passed to getVisualStudioVersion");
 }
 
 namespace {
@@ -58,9 +64,10 @@ inline void outputConfiguration(std::ostream &project, const std::string &config
 	           "\t\t</ProjectConfiguration>\n";
 }
 
-inline void outputConfigurationType(const BuildSetup &setup, std::ostream &project, const std::string &name, const std::string &config) {
+inline void outputConfigurationType(const BuildSetup &setup, std::ostream &project, const std::string &name, const std::string &config, int version) {
 	project << "\t<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='" << config << "'\" Label=\"Configuration\">\n"
 	           "\t\t<ConfigurationType>" << ((name == setup.projectName || setup.devTools) ? "Application" : "StaticLibrary") << "</ConfigurationType>\n"
+	           "\t\t<PlatformToolset>v" << version << "0</PlatformToolset>"
 	           "\t</PropertyGroup>\n";
 }
 
@@ -98,17 +105,18 @@ void MSBuildProvider::createProjectFile(const std::string &name, const std::stri
 	           "\t\t<ProjectGuid>{" << uuid << "}</ProjectGuid>\n"
 	           "\t\t<RootNamespace>" << name << "</RootNamespace>\n"
 	           "\t\t<Keyword>Win32Proj</Keyword>\n"
+	           "\t\t<VCTargetsPath Condition=\"'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''\">$(VCTargetsPath11)</VCTargetsPath>\n"
 	           "\t</PropertyGroup>\n";
 
 	// Shared configuration
 	project << "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />\n";
 
-	outputConfigurationType(setup, project, name, "Release|Win32");
-	outputConfigurationType(setup, project, name, "Analysis|Win32");
-	outputConfigurationType(setup, project, name, "Debug|Win32");
-	outputConfigurationType(setup, project, name, "Release|x64");
-	outputConfigurationType(setup, project, name, "Analysis|x64");
-	outputConfigurationType(setup, project, name, "Debug|x64");
+	outputConfigurationType(setup, project, name, "Release|Win32", _version);
+	outputConfigurationType(setup, project, name, "Analysis|Win32", _version);
+	outputConfigurationType(setup, project, name, "Debug|Win32", _version);
+	outputConfigurationType(setup, project, name, "Release|x64", _version);
+	outputConfigurationType(setup, project, name, "Analysis|x64", _version);
+	outputConfigurationType(setup, project, name, "Debug|x64", _version);
 
 	project << "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.props\" />\n"
 	           "\t<ImportGroup Label=\"ExtensionSettings\">\n"
-- 
cgit v1.2.3


From 51352b32f15d9a919e9b7a7d3b5a92e31384e9f4 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Sat, 14 Jul 2012 12:34:12 -0400
Subject: CREATE_PROJECT: Disable SAFESEH in debug mode (for edit and continue)

---
 devtools/create_project/msbuild.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'devtools/create_project/msbuild.cpp')

diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 90a5e3c15b..c797770955 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -67,7 +67,7 @@ inline void outputConfiguration(std::ostream &project, const std::string &config
 inline void outputConfigurationType(const BuildSetup &setup, std::ostream &project, const std::string &name, const std::string &config, int version) {
 	project << "\t<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='" << config << "'\" Label=\"Configuration\">\n"
 	           "\t\t<ConfigurationType>" << ((name == setup.projectName || setup.devTools) ? "Application" : "StaticLibrary") << "</ConfigurationType>\n"
-	           "\t\t<PlatformToolset>v" << version << "0</PlatformToolset>"
+	           "\t\t<PlatformToolset>v" << version << "0</PlatformToolset>\n"
 	           "\t</PropertyGroup>\n";
 }
 
@@ -403,6 +403,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 		              "\t\t</ClCompile>\n"
 		              "\t\t<Link>\n"
 		              "\t\t\t<GenerateDebugInformation>true</GenerateDebugInformation>\n"
+		              "\t\t\t<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n"
 		              "\t\t\t<IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\n";
 	}
 
-- 
cgit v1.2.3