[[ VS2015 ]] Tweak environment options for VS2015

runrevmark · runrevmark · commit 2fcc060836c4 · 2017-02-01T11:07:06.000Z
This patch tweaks various environment flags and options to ensure
a build works under VS2015.

It ensures that the ARCH variable is always set and defaults to x86.
It maps ARCH to the Microsoft architecture name (X86 = x86 and X64 =
x86_64) and ensures that it is used to set the target_arch of the build.

To ensure that things build consistently targetting the correct
architecture, it ensures that /MACHINE is set for the link and
lib tools.

Finally it ensures the gyp is called targetting VS 2015 output and
the architecture specified by ARCH.
diff --git a/config/win32.gypi b/config/win32.gypi
@@ -44,8 +44,6 @@
 					
 					'VCLinkerTool':
 					{
-						'AdditionalOptions': '/NODEFAULTLIB:LIBCMT',
-						'LinkIncremental': '2',
 						'OptimizeReferences': '2',
 						'GenerateDebugInformation': 'true',
 						'EnableCOMDATFolding': '2',
@@ -185,10 +183,23 @@
 				'Detect64BitPortabilityProblems': 'false',
 			},
 			
+			'VCLibrarianTool':
+			{
+				'AdditionalOptions':
+				[
+					'/MACHINE:<(target_arch)',
+				],
+			},
+
 			'VCLinkerTool':
 			{
 				'SubSystem': '2',
 				'RandomizedBaseAddress': '1',	# /DYNAMICBASE:NO - disable ASLR
+				'ImageHasSafeExceptionHandlers': 'false',
+				'AdditionalOptions':
+				[
+					'/MACHINE:<(target_arch)',
+				],
 			},
 		},
 	},
diff --git a/configure.bat b/configure.bat
@@ -12,6 +12,16 @@ IF NOT DEFINED programfiles(x86) SET programfiles(x86)=%programfiles%
 REM When calling configure.bat from the command line, BUILD_EDITION is not defined
 IF NOT DEFINED BUILD_EDITION SET BUILD_EDITION="community"
 
+REM Target architecture currently defaults to 32-bit x86
+IF NOT DEFINED ARCH SET ARCH=x86
+
+REM The internal MSVC/Gyp name for x86_64 is x64
+IF %ARCH%==x86_64 (
+  SET MSVC_ARCH=x64
+) ELSE (
+  SET MSVC_ARCH=%ARCH%
+)
+
 REM Note: to test whether a directory exists in batch script, you need to check
 REM whether a file within that directory exists. Easiest way to do this is to
 REM add the "*" wildcard after the directory
@@ -63,8 +73,7 @@ IF /I %BUILD_EDITION% == commercial (
 )
 
 REM Run the configure step
-%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-x86/livecode -Gmsvs_version=2010 %extra_options% %gypfile%
-PAUSE
+%python% gyp\gyp_main.py --format msvs --depth . --generator-output build-win-%ARCH%/livecode -Dtarget_arch=%MSVC_ARCH% -Gmsvs_version=2015 %extra_options% %gypfile%
 
 REM Pause if there was an error so that the user gets a chance to see it
 IF %ERRORLEVEL% NEQ 0 PAUSE
