diff options
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index 0a4183b1c9..7060608329 100644 --- a/common.gypi +++ b/common.gypi @@ -1,8 +1,6 @@ { 'variables': { 'visibility%': 'hidden', # V8's visibility setting - 'target_arch%': 'ia32', # set v8's target architecture - 'host_arch%': 'ia32', # set v8's host architecture 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds 'component%': 'static_library', # NB. these names match with what V8 expects 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way @@ -14,6 +12,11 @@ 'Debug': { 'defines': [ 'DEBUG', '_DEBUG' ], 'cflags': [ '-g', '-O0' ], + 'conditions': [ + ['target_arch=="x64"', { + 'msvs_configuration_platform': 'x64', + }], + ], 'msvs_settings': { 'VCCLCompilerTool': { 'target_conditions': [ @@ -36,6 +39,11 @@ 'Release': { 'defines': [ 'NDEBUG' ], 'cflags': [ '-O3', '-fomit-frame-pointer', '-fdata-sections', '-ffunction-sections' ], + 'conditions': [ + ['target_arch=="x64"', { + 'msvs_configuration_platform': 'x64', + }], + ], 'msvs_settings': { 'VCCLCompilerTool': { 'target_conditions': [ @@ -83,6 +91,11 @@ 'VCLibrarianTool': { }, 'VCLinkerTool': { + 'conditions': [ + ['target_arch=="x64"', { + 'TargetMachine' : 17 # /MACHINE:X64 + }], + ], 'GenerateDebugInformation': 'true', 'RandomizedBaseAddress': 2, # enable ASLR 'DataExecutionPrevention': 2, # enable DEP |