diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-12 19:12:26 +0400 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-12 19:12:26 +0400 |
| commit | 8a6576f764f73e4f74c277aa5f9bb4490ea07cf1 (patch) | |
| tree | 3e372835ec5b25b56b1bccd27ae74932dd0854cd /common.gypi | |
| parent | a27320e00f12d26dad1b464bf89484faf429a688 (diff) | |
| parent | 2f759a7090a15824a261e168221caa5109c86d44 (diff) | |
Merge remote-tracking branch 'origin/v0.6'
Conflicts:
common.gypi
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/common.gypi b/common.gypi index 68643b003a5..20a5d11cbdc 100644 --- a/common.gypi +++ b/common.gypi @@ -15,6 +15,11 @@ 'Debug': { 'defines': [ 'DEBUG', '_DEBUG' ], 'cflags': [ '-g', '-O0' ], + 'conditions': [ + ['target_arch=="x64"', { + 'msvs_configuration_platform': 'x64', + }], + ], 'msvs_settings': { 'VCCLCompilerTool': { 'target_conditions': [ @@ -37,6 +42,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': [ @@ -86,6 +96,11 @@ 'VCLibrarianTool': { }, 'VCLinkerTool': { + 'conditions': [ + ['target_arch=="x64"', { + 'TargetMachine' : 17 # /MACHINE:X64 + }], + ], 'GenerateDebugInformation': 'true', 'RandomizedBaseAddress': 2, # enable ASLR 'DataExecutionPrevention': 2, # enable DEP |