summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 00:20:29 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 00:20:29 +0000
commitd06442883eb767e2b61de78f1d942fc0f9b87df1 (patch)
tree1a4d51ffb76cca03ceeb56c3f4b606bee6cfa176 /chrome
parent66cb83553557d41f5eb24a17c830f1e398fedb27 (diff)
downloadchromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.zip
chromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.tar.gz
chromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.tar.bz2
Build on Linux with shared libraries (significant chunks courtesy craigsch):
* Set $RPATH to $LIB_DIR in the SCons configuration. * Add missing dependencies: * net/net.gyp:net => testing/gtest.gyp:gtest * third_party/libxml/libxml.gyp:xmlcatalog => third_party/icu38/icu38.gyp:icuuc * chrome/chrome.gyp:perf_tests => renderer => views => webkit/webkit.gyp:glue * Add files: * third_party/WebKit/WebCore/loader/icon/IconRecord.cpp * third_party/WebKit/WebCore/page/Coordinates.cpp * skia/sgl/SkUnPreMultiply.cpp * Exclude on Linux: * chrome/views/controls/scroll_view.cc * chrome/views/focus/external_focus_tracker.cc * media/filter/ffmpeg_demuxer.{cc,h} * Remove files: * third_party/WebKit/WebCore/Configurations/Version.xcconfig * Sort the chrome.gyp:views linux exclusion list. * DEPS roll for $SHLINKFLAGS settings in gyp. Review URL: http://codereview.chromium.org/88058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp15
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 2005383..f71c50a 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2526,11 +2526,14 @@
'dependencies': [
'browser',
'common',
+ 'renderer',
'resources',
+ 'views',
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
+ '../webkit/webkit.gyp:glue',
],
'sources': [
'browser/visitedlink_perftest.cc',
@@ -2723,18 +2726,20 @@
'views/accessibility/accessible_wrapper.cc',
'views/accessibility/view_accessibility.cc',
'views/controls/scrollbar/bitmap_scroll_bar.cc',
- 'views/controls/button/image_button.cc',
'views/controls/button/button_dropdown.cc',
'views/controls/button/checkbox.cc',
- 'views/controls/menu/chrome_menu.cc',
+ 'views/controls/button/image_button.cc',
+ 'views/controls/button/menu_button.cc',
'views/controls/combo_box.cc',
- 'views/focus/focus_manager.cc',
- 'views/controls/table/group_table_view.cc',
'views/controls/hwnd_view.cc',
'views/controls/link.cc',
+ 'views/controls/menu/chrome_menu.cc',
'views/controls/menu/menu.cc',
- 'views/controls/button/menu_button.cc',
'views/controls/message_box_view.cc',
+ 'views/controls/scroll_view.cc',
+ 'views/controls/table/group_table_view.cc',
+ 'views/focus/external_focus_tracker.cc',
+ 'views/focus/focus_manager.cc',
'views/controls/button/native_button.cc',
'views/controls/native_control.cc',
'views/controls/scrollbar/native_scroll_bar.cc',