[Scummvm-cvs-logs] scummvm master -> 3079100409df05d5da47a0c2f0676659c7d9d733

Littleboy Littleboy at users.noreply.github.com
Sat Sep 7 00:36:02 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3079100409 CREATE_PROJECT: Change PlatformToolset name for latest version of LLVM on Windows


Commit: 3079100409df05d5da47a0c2f0676659c7d9d733
    https://github.com/scummvm/scummvm/commit/3079100409df05d5da47a0c2f0676659c7d9d733
Author: Littleboy (littleboy at scummvm.org)
Date: 2013-09-06T15:33:48-07:00

Commit Message:
CREATE_PROJECT: Change PlatformToolset name for latest version of LLVM on Windows

Changed paths:
    devtools/create_project/msbuild.cpp
    devtools/create_project/visualstudio.cpp



diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 44055ab..7bab5c1 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -117,13 +117,14 @@ void MSBuildProvider::createProjectFile(const std::string &name, const std::stri
 	project << "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />\n";
 
 	std::string version = "v" + std::to_string(_version) + "0";
+	std::string llvm = "LLVM-vs" + std::to_string(getVisualStudioVersion());
 
 	outputConfigurationType(setup, project, name, "Release|Win32", version);
 	outputConfigurationType(setup, project, name, "Analysis|Win32", version);
-	outputConfigurationType(setup, project, name, "LLVM|Win32", "llvm");
+	outputConfigurationType(setup, project, name, "LLVM|Win32", llvm);
 	outputConfigurationType(setup, project, name, "Debug|Win32", version);
 	outputConfigurationType(setup, project, name, "Release|x64", version);
-	outputConfigurationType(setup, project, name, "LLVM|x64", "llvm");
+	outputConfigurationType(setup, project, name, "LLVM|x64", llvm);
 	outputConfigurationType(setup, project, name, "Analysis|x64", version);
 	outputConfigurationType(setup, project, name, "Debug|x64", version);
 
diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index ac3c30b..438e077 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -121,7 +121,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std:
 		// Win32
 		outputConfiguration(setup, project, toolConfig, "Debug", "Win32", "");
 		outputConfiguration(setup, project, toolConfig, "Analysis", "Win32", "");
-		 outputConfiguration(setup, project, toolConfig, "LLVM", "Win32", "");
+		outputConfiguration(setup, project, toolConfig, "LLVM", "Win32", "");
 		outputConfiguration(setup, project, toolConfig, "Release", "Win32", "");
 		outputConfiguration(setup, project, toolConfig, "Debug", "x64", "64");
 		outputConfiguration(setup, project, toolConfig, "Analysis", "x64", "64");






More information about the Scummvm-git-logs mailing list