| OLD | NEW |
| 1 # conditions used in both common.gypi and skia.gyp in chromium | 1 # conditions used in both common.gypi and skia.gyp in chromium |
| 2 # | 2 # |
| 3 { | 3 { |
| 4 'defines': [ | 4 'defines': [ |
| 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| 6 'SK_SUPPORT_GPU=<(skia_gpu)', | 6 'SK_SUPPORT_GPU=<(skia_gpu)', |
| 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', | 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', |
| 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', | 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 'inherit_from': ['Debug'], | 131 'inherit_from': ['Debug'], |
| 132 'msvs_settings': { | 132 'msvs_settings': { |
| 133 'VCCLCompilerTool': { | 133 'VCCLCompilerTool': { |
| 134 # /ZI is not supported on 64bit | 134 # /ZI is not supported on 64bit |
| 135 'DebugInformationFormat': '3', # programDatabase (/Zi) | 135 'DebugInformationFormat': '3', # programDatabase (/Zi) |
| 136 }, | 136 }, |
| 137 }, | 137 }, |
| 138 }, | 138 }, |
| 139 'Release_x64': { | 139 'Release_x64': { |
| 140 'inherit_from': ['Release'], | 140 'inherit_from': ['Release'], |
| 141 'msvs_settings': { |
| 142 'VCCLCompilerTool': { |
| 143 # Don't specify /arch. SSE2 is implied by 64bit and specify
ing it warns. |
| 144 'EnableEnhancedInstructionSet': '0', # |
| 145 }, |
| 146 }, |
| 141 }, | 147 }, |
| 142 'Release_Developer_x64': { | 148 'Release_Developer_x64': { |
| 143 'inherit_from': ['Release_Developer'], | 149 'inherit_from': ['Release_Developer'], |
| 150 'msvs_settings': { |
| 151 'VCCLCompilerTool': { |
| 152 # Don't specify /arch. SSE2 is implied by 64bit and specify
ing it warns. |
| 153 'EnableEnhancedInstructionSet': '0', # |
| 154 }, |
| 155 }, |
| 144 }, | 156 }, |
| 145 }, | 157 }, |
| 146 }], | 158 }], |
| 147 [ 'skia_arch_width == 64', { | 159 [ 'skia_arch_width == 64', { |
| 148 'msvs_configuration_platform': 'x64', | 160 'msvs_configuration_platform': 'x64', |
| 149 }], | 161 }], |
| 150 [ 'skia_arch_width == 32', { | 162 [ 'skia_arch_width == 32', { |
| 151 'msvs_configuration_platform': 'Win32', | 163 'msvs_configuration_platform': 'Win32', |
| 152 }], | 164 }], |
| 153 [ 'skia_warnings_as_errors', { | 165 [ 'skia_warnings_as_errors', { |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 [ 'skia_is_bot', { | 649 [ 'skia_is_bot', { |
| 638 'defines': [ 'SK_CRASH_HANDLER' ], | 650 'defines': [ 'SK_CRASH_HANDLER' ], |
| 639 }], | 651 }], |
| 640 | 652 |
| 641 ], # end 'conditions' | 653 ], # end 'conditions' |
| 642 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 654 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 643 'xcode_settings': { | 655 'xcode_settings': { |
| 644 'SYMROOT': '<(DEPTH)/xcodebuild', | 656 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 645 }, | 657 }, |
| 646 } | 658 } |
| OLD | NEW |