| 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_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', | 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 'msvs_cygwin_shell': 0, | 24 'msvs_cygwin_shell': 0, |
| 25 'msvs_settings': { | 25 'msvs_settings': { |
| 26 'VCCLCompilerTool': { | 26 'VCCLCompilerTool': { |
| 27 'WarningLevel': '3', | 27 'WarningLevel': '3', |
| 28 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | 28 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', |
| 29 'DebugInformationFormat': '3', | 29 'DebugInformationFormat': '3', |
| 30 'ExceptionHandling': '0', | 30 'ExceptionHandling': '0', |
| 31 'AdditionalOptions': [ '/MP', ], | 31 'AdditionalOptions': [ '/MP', ], |
| 32 }, | 32 }, |
| 33 'VCLinkerTool': { | 33 'VCLinkerTool': { |
| 34 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM
on 32-bit builds." |
| 34 'AdditionalDependencies': [ | 35 'AdditionalDependencies': [ |
| 35 'OpenGL32.lib', | 36 'OpenGL32.lib', |
| 36 'usp10.lib', | 37 'usp10.lib', |
| 37 | 38 |
| 38 # Prior to gyp r1584, the following were included automatically. | 39 # Prior to gyp r1584, the following were included automatically. |
| 39 'kernel32.lib', | 40 'kernel32.lib', |
| 40 'gdi32.lib', | 41 'gdi32.lib', |
| 41 'winspool.lib', | 42 'winspool.lib', |
| 42 'comdlg32.lib', | 43 'comdlg32.lib', |
| 43 'advapi32.lib', | 44 'advapi32.lib', |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 'defines': [ | 620 'defines': [ |
| 620 'SK_USE_POSIX_THREADS', | 621 'SK_USE_POSIX_THREADS', |
| 621 ], | 622 ], |
| 622 }], | 623 }], |
| 623 ], # end 'conditions' | 624 ], # end 'conditions' |
| 624 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 625 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 625 'xcode_settings': { | 626 'xcode_settings': { |
| 626 'SYMROOT': '<(DEPTH)/xcodebuild', | 627 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 627 }, | 628 }, |
| 628 } | 629 } |
| OLD | NEW |