| 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 20 matching lines...) Expand all Loading... |
| 31 'WarningLevel': '3', | 31 'WarningLevel': '3', |
| 32 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | 32 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', |
| 33 'DebugInformationFormat': '3', | 33 'DebugInformationFormat': '3', |
| 34 'ExceptionHandling': '0', | 34 'ExceptionHandling': '0', |
| 35 'AdditionalOptions': [ '/MP', ], | 35 'AdditionalOptions': [ '/MP', ], |
| 36 }, | 36 }, |
| 37 'VCLinkerTool': { | 37 'VCLinkerTool': { |
| 38 'AdditionalDependencies': [ | 38 'AdditionalDependencies': [ |
| 39 'OpenGL32.lib', | 39 'OpenGL32.lib', |
| 40 'usp10.lib', | 40 'usp10.lib', |
| 41 |
| 42 # Prior to gyp r1584, the following were included automatically. |
| 43 'kernel32.lib', |
| 44 'gdi32.lib', |
| 45 'winspool.lib', |
| 46 'comdlg32.lib', |
| 47 'advapi32.lib', |
| 48 'shell32.lib', |
| 49 'ole32.lib', |
| 50 'oleaut32.lib', |
| 51 'user32.lib', |
| 52 'uuid.lib', |
| 53 'odbc32.lib', |
| 54 'odbccp32.lib', |
| 41 ], | 55 ], |
| 42 }, | 56 }, |
| 43 }, | 57 }, |
| 44 'configurations': { | 58 'configurations': { |
| 45 'Debug': { | 59 'Debug': { |
| 46 'msvs_settings': { | 60 'msvs_settings': { |
| 47 'VCCLCompilerTool': { | 61 'VCCLCompilerTool': { |
| 48 'DebugInformationFormat': '4', # editAndContiue (/ZI) | 62 'DebugInformationFormat': '4', # editAndContiue (/ZI) |
| 49 'Optimization': '0', # optimizeDisabled (/Od) | 63 'Optimization': '0', # optimizeDisabled (/Od) |
| 50 'PreprocessorDefinitions': ['_DEBUG'], | 64 'PreprocessorDefinitions': ['_DEBUG'], |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 'xcode_settings': { | 403 'xcode_settings': { |
| 390 'SYMROOT': '<(DEPTH)/xcodebuild', | 404 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 391 }, | 405 }, |
| 392 } | 406 } |
| 393 | 407 |
| 394 # Local Variables: | 408 # Local Variables: |
| 395 # tab-width:2 | 409 # tab-width:2 |
| 396 # indent-tabs-mode:nil | 410 # indent-tabs-mode:nil |
| 397 # End: | 411 # End: |
| 398 # vim: set expandtab tabstop=2 shiftwidth=2: | 412 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |