Use a host build of the server engine when cross-compiling

This is needed as we use the server engine to generate some of the
components of the build but, when cross-compiling, we can't run the server
engine for the target.

Author: Fraser J. Gordon

engine/engine-common.gyp

@@ -10,6 +10,8 @@
 		{
 			'target_name': 'encode_version',
 			'type': 'none',
+
+			'toolsets': ['host', 'target'],
 
 			'actions':
 			[
@@ -50,6 +52,8 @@
 			'target_name': 'quicktime_stubs',
 			'type': 'none',
 
+			'toolsets': ['host', 'target'],
+
 			'actions':
 			[
 				{

engine/engine.gyp

@@ -20,35 +20,53 @@
 	},
 
 	'targets':
-	[	
+	[
 		{
-			'target_name': 'descriptify_environment_stack',
+			'target_name': 'host-server',
 			'type': 'none',
-			
-			'variables':
-			{
-				'conditions':
+
+			'toolsets': ['host', 'target'],
+
+			'conditions':
+			[
 				[
-					[
-						'host_os == "linux"',
-						{
-							'engine': '<(PRODUCT_DIR)/server-community',
-						},
-					],
-					[
-						'host_os == "mac"',
+					'cross_compile != 0',
+					{
+						'dependencies':
+						[
+							'server#host',
+						],
+
+						'direct_dependent_settings':
 						{
-							'engine': '<(PRODUCT_DIR)/server-community',
+							'variables':
+							{
+								'engine': '<(PRODUCT_DIR)/server-community-host>(exe_suffix)'
+							},
 						},
-					],
-					[
-						'host_os == "win"',
+					},
+					{
+						'dependencies':
+						[
+							'server#target',
+						],
+
+						'direct_dependent_settings':
 						{
-							'engine': '<(PRODUCT_DIR)/server-community.exe',
+							'variables':
+							{
+								'engine': '<(PRODUCT_DIR)/server-community>(exe_suffix)',
+							},
 						},
-					],
+					},
 				],
-			},
+			],
+		},
+
+		
+		{
+			'target_name': 'descriptify_environment_stack',
+			'type': 'none',
 
 			'sources':
 			[
@@ -72,7 +90,7 @@
 			'dependencies':
 			[
 				# Requires a working LiveCode engine
-				'server',
+				'host-server',
 			],
 
 			'actions':
@@ -94,7 +112,7 @@
 
 					'action':
 					[
-						'<(engine)',
+						'>(engine)',
 						'../util/descriptify_stack.livecodescript',
 						'<(SHARED_INTERMEDIATE_DIR)/src/environment_descriptified.livecode',
 						'<@(_sources)',
@@ -145,6 +163,8 @@
 			'type': 'executable',
 			'product_name': 'server-community',
 
+			'toolsets': ['host', 'target'],
+
 			'dependencies':
 			[
 				'kernel-server.gyp:kernel-server',
@@ -177,6 +197,16 @@
 					},
 				],
 			],
+
+			'target_conditions':
+			[
+				[
+					'_toolset == "host"',
+					{
+						'product_name': 'server-community-host',
+					},
+				],
+			],
 
 			'msvs_settings':
 			{

engine/host-server.gyp

@@ -0,0 +1,51 @@
+{
+	'include':
+	[
+		'../common.gypi',
+	],
+
+	'targets':
+	[
+		{
+			'target_name': 'host-server',
+			'type': 'none',
+
+			'toolsets': ['host', 'target'],
+
+			'conditions':
+			[
+				[
+					'cross_compile != 0',
+					{
+						'dependencies':
+						[
+							'engine.gyp:server#host',
+						],
+
+						'direct_dependent_settings':
+						{
+							'variables':
+							{
+								'engine': '<(PRODUCT_DIR)/server-community-host>(exe_suffix)'
+							},
+						},
+					},
+					{
+						'dependencies':
+						[
+							'engine.gyp:server#target',
+						],
+
+						'direct_dependent_settings':
+						{
+							'variables':
+							{
+								'engine': '<(PRODUCT_DIR)/server-community>(exe_suffix)',
+							},
+						},
+					},
+				],
+			],
+		},
+	],
+}

engine/kernel-server.gyp

@@ -34,6 +34,8 @@
 			'target_name': 'kernel-server',
 			'type': 'static_library',
 
+			'toolsets': ['host', 'target'],
+
 			'includes':
 			[
 				'kernel-mode-template.gypi',

engine/lcb-modules.gyp

@@ -12,6 +12,8 @@
 			'target_name': 'engine_lcb_modules',
 			'type': 'none',
 
+			'toolsets': ['host', 'target'],
+			
 			'dependencies':
 			[
 				'../toolchain/lc-compile/lc-compile.gyp:lc-compile#host',