[[ CodeResources ]] Implement platform_id variable in gyp

montegoulding · montegoulding · commit 0e1aa09cab13 · 2017-12-13T21:24:45.000+11:00
This patch implements a `platform_id` variable in gyp that conforms
to the platform ID spec.
diff --git a/common.gypi b/common.gypi
@@ -12,5 +12,30 @@
 		'config/version.gypi',
 		'config/yacc.gypi',
 	],
+	
+	# generate platform ID once all config is included
+	'variables':
+	{
+		'conditions':
+		[
+			[
+				'(OS == "mac" or OS == "ios")',
+				{
+					'platform_id': 'universal-<(OS)-<(target_sdk)',
+				},
+			],
+			[
+				'OS == "win"',
+				{
+					'platform_id': '<(uniform_arch)-<(OS)-msvc<(msvs_compiler_version)_<(msvs_crt_mode)',
+				},
+			],
+			[
+				'OS != "win" and OS != "mac" and OS != "ios"',
+				{
+					'platform_id': '<(uniform_arch)-<(OS)',
+				},
+			],
+		],
+	},	
 }
-
diff --git a/config/win32.gypi b/config/win32.gypi
@@ -23,6 +23,7 @@
 			'debug_info_suffix': '',
 
 			'silence_warnings': 0,
+			'msvs_compiler_version': "141",
 		},
 		
 		# Don't assume a Cygwin environment when invoking actions
@@ -31,7 +32,7 @@
 		# TODO [2017-04-11]: Remove these overrides when we can use 	
 		# -Gmsvs_version=2017
 		"msvs_target_platform_version" : "10.0.14393.0",
-		"msbuild_toolset" : "v141",
+		"msbuild_toolset" : "v<(msvs_compiler_version)",
 		
 		# WIN64-CHECK
 		'conditions':
@@ -42,13 +43,19 @@
 					'msvs_target_platform': 'x64',
 					'msvs_configuration_platform': 'x64',
 				},
+				
 			],
 		],
 
 		'configurations':
 		{
 			'Debug':
-			{
+			{	
+				'variables':
+				{
+					'msvs_crt_mode': 'mtd',
+				},
+				
 				'msvs_settings':
 				{
 					'VCCLCompilerTool':
@@ -86,6 +93,11 @@
 			
 			'Release':
 			{
+				'variables':
+				{
+					'msvs_crt_mode': 'mt',
+				},
+				
 				'msvs_settings':
 				{
 					'VCCLCompilerTool':
@@ -109,6 +121,12 @@
 			
 			'Fast':
 			{
+			
+				'variables':
+				{
+					'msvs_crt_mode': 'mt',
+				},
+			
 				'msvs_settings':
 				{
 					'VCCLCompilerTool':
