Commit dc3b19e7 authored by tkent@chromium.org's avatar tkent@chromium.org

2010-08-30 Marc-Antoine Ruel <maruel@chromium.org>

        Reviewed by Kent Tamura

        Move most dependencies to webcore_prerequisites
        https://bugs.webkit.org/show_bug.cgi?id=44814

        * WebCore.gyp/WebCore.gyp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66370 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0e12eb32
2010-08-30 Marc-Antoine Ruel <maruel@chromium.org>
Reviewed by Kent Tamura
Move most dependencies to webcore_prerequisites
https://bugs.webkit.org/show_bug.cgi?id=44814
* WebCore.gyp/WebCore.gyp:
2010-08-30 Adam Barth <abarth@webkit.org> 2010-08-30 Adam Barth <abarth@webkit.org>
Move AsyncImageResizer back to html to fix Chromium build. Move AsyncImageResizer back to html to fix Chromium build.
...@@ -870,6 +870,12 @@ ...@@ -870,6 +870,12 @@
}, },
'conditions': [ 'conditions': [
['javascript_engine=="v8"', { ['javascript_engine=="v8"', {
'dependencies': [
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
],
'export_dependent_settings': [
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
],
'conditions': [ 'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', { ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
'defines': [ 'defines': [
...@@ -878,7 +884,23 @@ ...@@ -878,7 +884,23 @@
}], }],
], ],
}], }],
['use_accelerated_compositing==1', {
'dependencies': [
'<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
],
'export_dependent_settings': [
'<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
],
}],
['OS=="linux" or OS=="freebsd"', { ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
'<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
'<(chromium_src_dir)/build/linux/system.gyp:gtk',
],
'export_dependent_settings': [
'<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
'<(chromium_src_dir)/build/linux/system.gyp:gtk',
],
'cflags': [ 'cflags': [
# WebCore does not work with strict aliasing enabled. # WebCore does not work with strict aliasing enabled.
# https://bugs.webkit.org/show_bug.cgi?id=25864 # https://bugs.webkit.org/show_bug.cgi?id=25864
...@@ -895,6 +917,12 @@ ...@@ -895,6 +917,12 @@
], ],
}], }],
['OS=="mac"', { ['OS=="mac"', {
'dependencies': [
'webkit_system_interface',
],
'export_dependent_settings': [
'webkit_system_interface',
],
'defines': [ 'defines': [
# Match Safari and Mozilla on Mac x86. # Match Safari and Mozilla on Mac x86.
'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"', 'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"',
...@@ -925,6 +953,12 @@ ...@@ -925,6 +953,12 @@
], ],
}], }],
['OS=="win"', { ['OS=="win"', {
'dependencies': [
'<(chromium_src_dir)/build/win/system.gyp:cygwin'
],
'export_dependent_settings': [
'<(chromium_src_dir)/build/win/system.gyp:cygwin'
],
'defines': [ 'defines': [
# Match Safari and Mozilla on Windows. # Match Safari and Mozilla on Windows.
'WEBCORE_NAVIGATOR_PLATFORM="Win32"', 'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
...@@ -1074,11 +1108,6 @@ ...@@ -1074,11 +1108,6 @@
], ],
}, },
'conditions': [ 'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
],
}],
['enable_svg!=0', { ['enable_svg!=0', {
'sources/': [ 'sources/': [
['exclude', 'svg/[^/]+\\.cpp$'], ['exclude', 'svg/[^/]+\\.cpp$'],
...@@ -1093,16 +1122,7 @@ ...@@ -1093,16 +1122,7 @@
['exclude', 'rendering/SVG'], ['exclude', 'rendering/SVG'],
], ],
}], }],
['use_accelerated_compositing==1', {
'dependencies': [
'<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
],
}],
['OS=="linux" or OS=="freebsd"', { ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
'<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
'<(chromium_src_dir)/build/linux/system.gyp:gtk',
],
'sources': [ 'sources': [
'../platform/graphics/chromium/VDMXParser.cpp', '../platform/graphics/chromium/VDMXParser.cpp',
'../platform/graphics/chromium/HarfbuzzSkia.cpp', '../platform/graphics/chromium/HarfbuzzSkia.cpp',
...@@ -1245,9 +1265,6 @@ ...@@ -1245,9 +1265,6 @@
], ],
}], }],
['OS=="win"', { ['OS=="win"', {
'dependencies': [
'<(chromium_src_dir)/build/win/system.gyp:cygwin'
],
'sources/': [ 'sources/': [
['exclude', 'Posix\\.cpp$'], ['exclude', 'Posix\\.cpp$'],
['include', '/opentype/'], ['include', '/opentype/'],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment