Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: gyp/common_conditions.gypi

Issue 237173002: Roll ANGLE. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/angle.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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' : [
11 [ 'skia_arch_type == "arm64"', { 11 [ 'skia_arch_type == "arm64"', {
12 'cflags': [ 12 'cflags': [
13 '-ffp-contract=off', 13 '-ffp-contract=off',
14 ], 14 ],
15 }], 15 }],
16 16
17 [ 'skia_os == "win"', 17 [ 'skia_os == "win"',
18 { 18 {
19 'defines': [ 19 'defines': [
20 'SK_BUILD_FOR_WIN32', 20 'SK_BUILD_FOR_WIN32',
21 '_CRT_SECURE_NO_WARNINGS', 21 '_CRT_SECURE_NO_WARNINGS',
22 'GR_GL_FUNCTION_TYPE=__stdcall', 22 'GR_GL_FUNCTION_TYPE=__stdcall',
23 ], 23 ],
24 'msvs_cygwin_shell': 0, 24 'msvs_cygwin_shell': 0,
25 'msvs_disabled_warnings': [4275],
25 'msvs_settings': { 26 'msvs_settings': {
26 'VCCLCompilerTool': { 27 'VCCLCompilerTool': {
27 'WarningLevel': '3', 28 'WarningLevel': '3',
28 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 29 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb',
29 'DebugInformationFormat': '3', 30 'DebugInformationFormat': '3',
30 'ExceptionHandling': '0', 31 'ExceptionHandling': '0',
31 'AdditionalOptions': [ '/MP', ], 32 'AdditionalOptions': [ '/MP', ],
32 }, 33 },
33 'VCLinkerTool': { 34 'VCLinkerTool': {
34 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM on 32-bit builds." 35 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM on 32-bit builds."
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 'defines': [ 621 'defines': [
621 'SK_USE_POSIX_THREADS', 622 'SK_USE_POSIX_THREADS',
622 ], 623 ],
623 }], 624 }],
624 ], # end 'conditions' 625 ], # end 'conditions'
625 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 626 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
626 'xcode_settings': { 627 'xcode_settings': {
627 'SYMROOT': '<(DEPTH)/xcodebuild', 628 'SYMROOT': '<(DEPTH)/xcodebuild',
628 }, 629 },
629 } 630 }
OLDNEW
« no previous file with comments | « gyp/angle.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698