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

Side by Side Diff: WebCore/WebCore.gyp/WebCore.gyp

Issue 3225004: Move all the remaining dependencies in webcore_remaining into webcore_prerequisites (Closed) Base URL: git://git.webkit.org/WebKit.git
Patch Set: diff against http://codereview.chromium.org/3223009 Created 10 years, 3 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 | « WebCore/ChangeLog ('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 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 'scons_line_length' : 1, 865 'scons_line_length' : 1,
866 'xcode_settings': { 866 'xcode_settings': {
867 # Some Mac-specific parts of WebKit won't compile without having this 867 # Some Mac-specific parts of WebKit won't compile without having this
868 # prefix header injected. 868 # prefix header injected.
869 # FIXME: make this a first-class setting. 869 # FIXME: make this a first-class setting.
870 'GCC_PREFIX_HEADER': '../WebCorePrefix.h', 870 'GCC_PREFIX_HEADER': '../WebCorePrefix.h',
871 }, 871 },
872 }, 872 },
873 'conditions': [ 873 'conditions': [
874 ['javascript_engine=="v8"', { 874 ['javascript_engine=="v8"', {
875 'dependencies': [
876 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
877 ],
878 'export_dependent_settings': [
879 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
880 ],
875 'conditions': [ 881 'conditions': [
876 ['inside_chromium_build==1 and OS=="win" and component=="shared_libr ary"', { 882 ['inside_chromium_build==1 and OS=="win" and component=="shared_libr ary"', {
877 'defines': [ 883 'defines': [
878 'USING_V8_SHARED', 884 'USING_V8_SHARED',
879 ], 885 ],
880 }], 886 }],
881 ], 887 ],
882 }], 888 }],
889 ['use_accelerated_compositing==1', {
890 'dependencies': [
891 '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
892 ],
893 'export_dependent_settings': [
894 '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
895 ],
896 }],
883 ['OS=="linux" or OS=="freebsd"', { 897 ['OS=="linux" or OS=="freebsd"', {
898 'dependencies': [
899 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
900 '<(chromium_src_dir)/build/linux/system.gyp:gtk',
901 ],
902 'export_dependent_settings': [
903 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
904 '<(chromium_src_dir)/build/linux/system.gyp:gtk',
905 ],
884 'cflags': [ 906 'cflags': [
885 # WebCore does not work with strict aliasing enabled. 907 # WebCore does not work with strict aliasing enabled.
886 # https://bugs.webkit.org/show_bug.cgi?id=25864 908 # https://bugs.webkit.org/show_bug.cgi?id=25864
887 '-fno-strict-aliasing', 909 '-fno-strict-aliasing',
888 ], 910 ],
889 }], 911 }],
890 ['OS=="linux"', { 912 ['OS=="linux"', {
891 'defines': [ 913 'defines': [
892 # Mozilla on Linux effectively uses uname -sm, but when running 914 # Mozilla on Linux effectively uses uname -sm, but when running
893 # 32-bit x86 code on an x86_64 processor, it uses 915 # 32-bit x86 code on an x86_64 processor, it uses
894 # "Linux i686 (x86_64)". Matching that would require making a 916 # "Linux i686 (x86_64)". Matching that would require making a
895 # run-time determination. 917 # run-time determination.
896 'WEBCORE_NAVIGATOR_PLATFORM="Linux i686"', 918 'WEBCORE_NAVIGATOR_PLATFORM="Linux i686"',
897 ], 919 ],
898 }], 920 }],
899 ['OS=="mac"', { 921 ['OS=="mac"', {
922 'dependencies': [
923 'webkit_system_interface',
924 ],
925 'export_dependent_settings': [
926 'webkit_system_interface',
927 ],
900 'defines': [ 928 'defines': [
901 # Match Safari and Mozilla on Mac x86. 929 # Match Safari and Mozilla on Mac x86.
902 'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"', 930 'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"',
903 931
904 # Chromium's version of WebCore includes the following Objective-C 932 # Chromium's version of WebCore includes the following Objective-C
905 # classes. The system-provided WebCore framework may also provide 933 # classes. The system-provided WebCore framework may also provide
906 # these classes. Because of the nature of Objective-C binding 934 # these classes. Because of the nature of Objective-C binding
907 # (dynamically at runtime), it's possible for the Chromium-provided 935 # (dynamically at runtime), it's possible for the Chromium-provided
908 # versions to interfere with the system-provided versions. This may 936 # versions to interfere with the system-provided versions. This may
909 # happen when a system framework attempts to use WebCore.framework, 937 # happen when a system framework attempts to use WebCore.framework,
(...skipping 10 matching lines...) Expand all
920 # library, these defines should be removed entirely. 948 # library, these defines should be removed entirely.
921 'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver', 949 'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',
922 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRe nderThemeNotificationObserver', 950 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRe nderThemeNotificationObserver',
923 'WebFontCache=ChromiumWebCoreObjCWebFontCache', 951 'WebFontCache=ChromiumWebCoreObjCWebFontCache',
924 ], 952 ],
925 'include_dirs': [ 953 'include_dirs': [
926 '../../WebKitLibraries', 954 '../../WebKitLibraries',
927 ], 955 ],
928 }], 956 }],
929 ['OS=="win"', { 957 ['OS=="win"', {
958 'dependencies': [
959 '<(chromium_src_dir)/build/win/system.gyp:cygwin'
960 ],
961 'export_dependent_settings': [
962 '<(chromium_src_dir)/build/win/system.gyp:cygwin'
963 ],
930 'defines': [ 964 'defines': [
931 # Match Safari and Mozilla on Windows. 965 # Match Safari and Mozilla on Windows.
932 'WEBCORE_NAVIGATOR_PLATFORM="Win32"', 966 'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
933 '__PRETTY_FUNCTION__=__FUNCTION__', 967 '__PRETTY_FUNCTION__=__FUNCTION__',
934 ], 968 ],
935 # This is needed because Event.h in this directory is blocked 969 # This is needed because Event.h in this directory is blocked
936 # by a system header on windows. 970 # by a system header on windows.
937 'include_dirs++': ['../dom'], 971 'include_dirs++': ['../dom'],
938 }], 972 }],
939 ], 973 ],
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1069 '../Resources/southResizeCursor.png', 1103 '../Resources/southResizeCursor.png',
1070 '../Resources/southWestResizeCursor.png', 1104 '../Resources/southWestResizeCursor.png',
1071 '../Resources/verticalTextCursor.png', 1105 '../Resources/verticalTextCursor.png',
1072 '../Resources/waitCursor.png', 1106 '../Resources/waitCursor.png',
1073 '../Resources/westResizeCursor.png', 1107 '../Resources/westResizeCursor.png',
1074 '../Resources/zoomInCursor.png', 1108 '../Resources/zoomInCursor.png',
1075 '../Resources/zoomOutCursor.png', 1109 '../Resources/zoomOutCursor.png',
1076 ], 1110 ],
1077 }, 1111 },
1078 'conditions': [ 1112 'conditions': [
1079 ['javascript_engine=="v8"', {
1080 'dependencies': [
1081 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
1082 ],
1083 }],
1084 ['enable_svg!=0', { 1113 ['enable_svg!=0', {
1085 'sources/': [ 1114 'sources/': [
1086 ['exclude', 'svg/[^/]+\\.cpp$'], 1115 ['exclude', 'svg/[^/]+\\.cpp$'],
1087 ['include', 'svg/SVGAllInOne\\.cpp$'], 1116 ['include', 'svg/SVGAllInOne\\.cpp$'],
1088 ], 1117 ],
1089 }, { # svg disabled 1118 }, { # svg disabled
1090 'sources/': [ 1119 'sources/': [
1091 ['exclude', 'svg/'], 1120 ['exclude', 'svg/'],
1092 ['exclude', 'css/svg/'], 1121 ['exclude', 'css/svg/'],
1093 ['exclude', 'rendering/style/SVG'], 1122 ['exclude', 'rendering/style/SVG'],
1094 ['exclude', 'rendering/RenderSVG'], 1123 ['exclude', 'rendering/RenderSVG'],
1095 ['exclude', 'rendering/SVG'], 1124 ['exclude', 'rendering/SVG'],
1096 ], 1125 ],
1097 }], 1126 }],
1098 ['use_accelerated_compositing==1', {
1099 'dependencies': [
1100 '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
1101 ],
1102 }],
1103 ['OS=="linux" or OS=="freebsd"', { 1127 ['OS=="linux" or OS=="freebsd"', {
1104 'dependencies': [
1105 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
1106 '<(chromium_src_dir)/build/linux/system.gyp:gtk',
1107 ],
1108 'sources': [ 1128 'sources': [
1109 '../platform/graphics/chromium/VDMXParser.cpp', 1129 '../platform/graphics/chromium/VDMXParser.cpp',
1110 '../platform/graphics/chromium/HarfbuzzSkia.cpp', 1130 '../platform/graphics/chromium/HarfbuzzSkia.cpp',
1111 ], 1131 ],
1112 'sources/': [ 1132 'sources/': [
1113 # Cherry-pick files excluded by the broader regular expressions abov e. 1133 # Cherry-pick files excluded by the broader regular expressions abov e.
1114 ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'], 1134 ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'],
1115 ['include', 'platform/graphics/chromium/FontCacheLinux\\.cpp$'], 1135 ['include', 'platform/graphics/chromium/FontCacheLinux\\.cpp$'],
1116 ['include', 'platform/graphics/chromium/FontLinux\\.cpp$'], 1136 ['include', 'platform/graphics/chromium/FontLinux\\.cpp$'],
1117 ['include', 'platform/graphics/chromium/FontPlatformDataLinux\\.cpp$ '], 1137 ['include', 'platform/graphics/chromium/FontPlatformDataLinux\\.cpp$ '],
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 '../platform/image-decoders/png/PNGImageDecoder.h', 1260 '../platform/image-decoders/png/PNGImageDecoder.h',
1241 '../platform/image-decoders/skia/ImageDecoderSkia.cpp', 1261 '../platform/image-decoders/skia/ImageDecoderSkia.cpp',
1242 '../platform/image-decoders/xbm/XBMImageDecoder.cpp', 1262 '../platform/image-decoders/xbm/XBMImageDecoder.cpp',
1243 '../platform/image-decoders/xbm/XBMImageDecoder.h', 1263 '../platform/image-decoders/xbm/XBMImageDecoder.h',
1244 1264
1245 # Again, Skia is not used on Mac. 1265 # Again, Skia is not used on Mac.
1246 '../platform/chromium/DragImageChromiumSkia.cpp', 1266 '../platform/chromium/DragImageChromiumSkia.cpp',
1247 ], 1267 ],
1248 }], 1268 }],
1249 ['OS=="win"', { 1269 ['OS=="win"', {
1250 'dependencies': [
1251 '<(chromium_src_dir)/build/win/system.gyp:cygwin'
1252 ],
1253 'sources/': [ 1270 'sources/': [
1254 ['exclude', 'Posix\\.cpp$'], 1271 ['exclude', 'Posix\\.cpp$'],
1255 ['include', '/opentype/'], 1272 ['include', '/opentype/'],
1256 ['include', '/SkiaFontWin\\.cpp$'], 1273 ['include', '/SkiaFontWin\\.cpp$'],
1257 ['include', '/TransparencyWin\\.cpp$'], 1274 ['include', '/TransparencyWin\\.cpp$'],
1258 ], 1275 ],
1259 }], 1276 }],
1260 ['OS!="linux" and OS!="freebsd"', { 1277 ['OS!="linux" and OS!="freebsd"', {
1261 'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']] 1278 'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]
1262 }], 1279 }],
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 }], 1334 }],
1318 ['OS=="win"', { 1335 ['OS=="win"', {
1319 'direct_dependent_settings': { 1336 'direct_dependent_settings': {
1320 'include_dirs+++': ['../dom'], 1337 'include_dirs+++': ['../dom'],
1321 }, 1338 },
1322 }], 1339 }],
1323 ], 1340 ],
1324 }, 1341 },
1325 ], # targets 1342 ], # targets
1326 } 1343 }
OLDNEW
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698