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

Side by Side Diff: Source/WebKit/chromium/WebKit.gyp

Issue 16381002: Remove ENABLE_WEBGL #define as it's always enabled in Blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/dom/EventNames.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 ], 691 ],
692 }, { # else: OS!="android" 692 }, { # else: OS!="android"
693 'sources/': [ 693 'sources/': [
694 ['exclude', '/android/'], 694 ['exclude', '/android/'],
695 ], 695 ],
696 }], 696 }],
697 ['OS=="mac"', { 697 ['OS=="mac"', {
698 'include_dirs': [ 698 'include_dirs': [
699 'public/mac', 699 'public/mac',
700 ], 700 ],
701 'link_settings': {
702 'libraries': [
703 '$(SDKROOT)/System/Library/Frameworks/Accelerate.fra mework',
704 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framewo rk',
705 ],
706 },
701 }, { # else: OS!="mac" 707 }, { # else: OS!="mac"
702 'sources/': [ 708 'sources/': [
703 ['exclude', '/mac/'], 709 ['exclude', '/mac/'],
704 ], 710 ],
705 }], 711 }],
706 ['OS=="win"', { 712 ['OS=="win"', {
707 'include_dirs': [ 713 'include_dirs': [
708 'public/win', 714 'public/win',
709 ], 715 ],
710 }, { # else: OS!="win" 716 }, { # else: OS!="win"
711 'sources/': [['exclude', '/win/']], 717 'sources/': [['exclude', '/win/']],
712 'variables': { 718 'variables': {
713 # FIXME: Turn on warnings on Windows. 719 # FIXME: Turn on warnings on Windows.
714 'chromium_code': 1, 720 'chromium_code': 1,
715 } 721 }
716 }], 722 }],
717 ['"ENABLE_WEBGL=1" in feature_defines', {
718 'conditions': [
719 ['OS=="mac"', {
720 'link_settings': {
721 'libraries': [
722 '$(SDKROOT)/System/Library/Frameworks/Accele rate.framework',
723 '$(SDKROOT)/System/Library/Frameworks/OpenGL .framework',
724 ],
725 },
726 }],
727 ],
728 }],
729 ['use_default_render_theme==1', { 723 ['use_default_render_theme==1', {
730 'include_dirs': [ 724 'include_dirs': [
731 'public/default', 725 'public/default',
732 ], 726 ],
733 }, { # else use_default_render_theme==0 727 }, { # else use_default_render_theme==0
734 'sources/': [ 728 'sources/': [
735 ['exclude', 'src/default/WebRenderTheme.cpp'], 729 ['exclude', 'src/default/WebRenderTheme.cpp'],
736 ['exclude', 'public/default/WebRenderTheme.h'], 730 ['exclude', 'public/default/WebRenderTheme.h'],
737 ], 731 ],
738 }], 732 }],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 ['clang==1', { 793 ['clang==1', {
800 'target_defaults': { 794 'target_defaults': {
801 'cflags': ['-Wglobal-constructors'], 795 'cflags': ['-Wglobal-constructors'],
802 'xcode_settings': { 796 'xcode_settings': {
803 'WARNING_CFLAGS': ['-Wglobal-constructors'], 797 'WARNING_CFLAGS': ['-Wglobal-constructors'],
804 }, 798 },
805 }, 799 },
806 }], 800 }],
807 ], # conditions 801 ], # conditions
808 } 802 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/EventNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698