Merge pull request #118 from livecode/merge-develop_9.0-24.07.18

Merge develop 9.0 24.07.18

Author: livecodeali

libcef/libcef.gyp

@@ -9,6 +9,8 @@
 		{
 			'target_name': 'libcef_library_wrapper',
 			'type': 'static_library',
+
+			'toolsets': ['host', 'target'],
 
 			'variables':
 			{
@@ -17,16 +19,22 @@
 			},
 
 			# OSX, Windows and Linux only
-			'conditions':
+			'target_conditions':
 			[
 				[
-					'OS != "mac" and OS != "win" and OS != "linux"',
+					'not toolset_os in ("mac", "win", "linux")',
 					{
 						'type': 'none',
 					},
 				],
 				[
-					'OS == "win"',
+					'toolset_os == "linux" and not toolset_arch in ("x86", "x86_64")',
+					{
+						'type': 'none',
+					},
+				],
+				[
+					'toolset_os == "win"',
 					{
 						'defines':
 						[
@@ -262,17 +270,19 @@
 			'target_name': 'libcef_stubs',
 			'type': 'static_library',
 
+			'toolsets': ['host', 'target'],
+
 			'variables':
 			{
 				'library_for_module': 1,
 				'silence_warnings': 1,
 			},
 
 			# OSX, Windows and Linux only
-			'conditions':
+			'target_conditions':
 			[
 				[
-					'OS != "mac" and OS != "win" and OS != "linux"',
+					'not toolset_os in ("mac", "win", "linux")',
 					{
 						'type': 'none',
 					},

libexpat/libexpat.gyp

@@ -9,6 +9,8 @@
 		{
 			'target_name': 'libexpat',
 			'type': 'static_library',
+
+			'toolsets': ['host', 'target'],
 
 			'variables':
 			{
@@ -58,10 +60,10 @@
 				],
 			},
 
-			'conditions':
+			'target_conditions':
 			[
 				[
-					'OS != "android"',
+					'toolset_os != "android"',
 					{
 						'type': 'none',
 					},