| 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_HINTING_SCALE_FACTOR', | 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', |
| 7 ], | 7 ], |
| 8 'conditions' : [ | 8 'conditions' : [ |
| 9 [ 'skia_gpu == 1', | 9 [ 'skia_gpu == 1', |
| 10 { | 10 { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 }, { | 25 }, { |
| 26 'defines': [ | 26 'defines': [ |
| 27 'SK_SUPPORT_OPENCL=0', | 27 'SK_SUPPORT_OPENCL=0', |
| 28 ], | 28 ], |
| 29 }, | 29 }, |
| 30 ], | 30 ], |
| 31 [ 'skia_os == "win"', | 31 [ 'skia_os == "win"', |
| 32 { | 32 { |
| 33 'defines': [ | 33 'defines': [ |
| 34 'SK_BUILD_FOR_WIN32', | 34 'SK_BUILD_FOR_WIN32', |
| 35 'SK_FONTHOST_USES_FONTMGR', |
| 35 'SK_IGNORE_STDINT_DOT_H', | 36 'SK_IGNORE_STDINT_DOT_H', |
| 36 '_CRT_SECURE_NO_WARNINGS', | 37 '_CRT_SECURE_NO_WARNINGS', |
| 37 'GR_GL_FUNCTION_TYPE=__stdcall', | 38 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 38 ], | 39 ], |
| 39 'msvs_cygwin_shell': 0, | 40 'msvs_cygwin_shell': 0, |
| 40 'msvs_settings': { | 41 'msvs_settings': { |
| 41 'VCCLCompilerTool': { | 42 'VCCLCompilerTool': { |
| 42 'WarningLevel': '3', | 43 'WarningLevel': '3', |
| 43 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | 44 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', |
| 44 'DebugInformationFormat': '3', | 45 'DebugInformationFormat': '3', |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 }, | 287 }, |
| 287 ], | 288 ], |
| 288 | 289 |
| 289 [ 'skia_os == "mac"', | 290 [ 'skia_os == "mac"', |
| 290 { | 291 { |
| 291 'variables': { | 292 'variables': { |
| 292 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', | 293 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', |
| 293 }, | 294 }, |
| 294 'defines': [ | 295 'defines': [ |
| 295 'SK_BUILD_FOR_MAC', | 296 'SK_BUILD_FOR_MAC', |
| 297 'SK_FONTHOST_USES_FONTMGR', |
| 296 ], | 298 ], |
| 297 'conditions' : [ | 299 'conditions' : [ |
| 298 [ 'skia_arch_width == 64', { | 300 [ 'skia_arch_width == 64', { |
| 299 'xcode_settings': { | 301 'xcode_settings': { |
| 300 'ARCHS': ['x86_64'], | 302 'ARCHS': ['x86_64'], |
| 301 }, | 303 }, |
| 302 }], | 304 }], |
| 303 [ 'skia_arch_width == 32', { | 305 [ 'skia_arch_width == 32', { |
| 304 'xcode_settings': { | 306 'xcode_settings': { |
| 305 'ARCHS': ['i386'], | 307 'ARCHS': ['i386'], |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 'xcode_settings': { | 480 'xcode_settings': { |
| 479 'SYMROOT': '<(DEPTH)/xcodebuild', | 481 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 480 }, | 482 }, |
| 481 } | 483 } |
| 482 | 484 |
| 483 # Local Variables: | 485 # Local Variables: |
| 484 # tab-width:2 | 486 # tab-width:2 |
| 485 # indent-tabs-mode:nil | 487 # indent-tabs-mode:nil |
| 486 # End: | 488 # End: |
| 487 # vim: set expandtab tabstop=2 shiftwidth=2: | 489 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |