From 9821f3022433a0cc6f55733e6609fb2b11afc005 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Wed, 5 Sep 2012 07:54:33 -0400
Subject: CREATE_PROJECT: Add config option to disable language extensions and
 edit and continue (per-project)

---
 devtools/create_project/msvc.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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

diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 96eaf643d1..f995c108c7 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -33,6 +33,9 @@ namespace CreateProjectTool {
 //////////////////////////////////////////////////////////////////////////
 MSVCProvider::MSVCProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version)
 	: ProjectProvider(global_warnings, project_warnings, version) {
+
+	_enableLanguageExtensions = tokenize(ENABLE_LANGUAGE_EXTENSIONS, ',');
+	_disableEditAndContinue   = tokenize(DISABLE_EDIT_AND_CONTINUE, ',');
 }
 
 void MSVCProvider::createWorkspace(const BuildSetup &setup) {
@@ -75,10 +78,10 @@ void MSVCProvider::createWorkspace(const BuildSetup &setup) {
 	solution << "Global\n"
 	            "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n"
 	            "\t\tDebug|Win32 = Debug|Win32\n"
-				"\t\tAnalysis|Win32 = Analysis|Win32\n"
+	            "\t\tAnalysis|Win32 = Analysis|Win32\n"
 	            "\t\tRelease|Win32 = Release|Win32\n"
 	            "\t\tDebug|x64 = Debug|x64\n"
-				"\t\tAnalysis|x64 = Analysis|x64\n"
+	            "\t\tAnalysis|x64 = Analysis|x64\n"
 	            "\t\tRelease|x64 = Release|x64\n"
 	            "\tEndGlobalSection\n"
 	            "\tGlobalSection(ProjectConfigurationPlatforms) = postSolution\n";
@@ -86,14 +89,14 @@ void MSVCProvider::createWorkspace(const BuildSetup &setup) {
 	for (UUIDMap::const_iterator i = _uuidMap.begin(); i != _uuidMap.end(); ++i) {
 		solution << "\t\t{" << i->second << "}.Debug|Win32.ActiveCfg = Debug|Win32\n"
 		            "\t\t{" << i->second << "}.Debug|Win32.Build.0 = Debug|Win32\n"
-					"\t\t{" << i->second << "}.Analysis|Win32.ActiveCfg = Analysis|Win32\n"
-					"\t\t{" << i->second << "}.Analysis|Win32.Build.0 = Analysis|Win32\n"
+		            "\t\t{" << i->second << "}.Analysis|Win32.ActiveCfg = Analysis|Win32\n"
+		            "\t\t{" << i->second << "}.Analysis|Win32.Build.0 = Analysis|Win32\n"
 		            "\t\t{" << i->second << "}.Release|Win32.ActiveCfg = Release|Win32\n"
 		            "\t\t{" << i->second << "}.Release|Win32.Build.0 = Release|Win32\n"
 		            "\t\t{" << i->second << "}.Debug|x64.ActiveCfg = Debug|x64\n"
 		            "\t\t{" << i->second << "}.Debug|x64.Build.0 = Debug|x64\n"
-					"\t\t{" << i->second << "}.Analysis|x64.ActiveCfg = Analysis|x64\n"
-					"\t\t{" << i->second << "}.Analysis|x64.Build.0 = Analysis|x64\n"
+		            "\t\t{" << i->second << "}.Analysis|x64.ActiveCfg = Analysis|x64\n"
+		            "\t\t{" << i->second << "}.Analysis|x64.Build.0 = Analysis|x64\n"
 		            "\t\t{" << i->second << "}.Release|x64.ActiveCfg = Release|x64\n"
 		            "\t\t{" << i->second << "}.Release|x64.Build.0 = Release|x64\n";
 	}
@@ -139,7 +142,7 @@ void MSVCProvider::createGlobalProp(const BuildSetup &setup) {
 	StringList x64EngineDefines = getEngineDefines(setup.engines);
 	x64Defines.splice(x64Defines.end(), x64EngineDefines);
 
-	// HACK: This definitly should not be here, but otherwise we would not define SDL_BACKEND for x64.
+	// HACK: This definitely should not be here, but otherwise we would not define SDL_BACKEND for x64.
 	x64Defines.push_back("WIN32");
 	x64Defines.push_back("SDL_BACKEND");
 
-- 
cgit v1.2.3


From 754a4bb8e422251b82175adef246d92bc33f83df Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Wed, 5 Sep 2012 07:56:23 -0400
Subject: CREATE_PROJECT: Remove hardcoded define for post-build event

---
 devtools/create_project/msvc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index f995c108c7..b8d2401af9 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -171,7 +171,7 @@ std::string MSVCProvider::getPostBuildEvent(bool isWin32, bool createInstaller)
 
 	cmdLine += (isWin32) ? "x86" : "x64";
 
-	cmdLine += " %SCUMMVM_LIBS% ";
+	cmdLine += " %" LIBS_DEFINE "% ";
 
 	// Specify if installer needs to be built or not
 	cmdLine += (createInstaller ? "1" : "0");
-- 
cgit v1.2.3