From d06442883eb767e2b61de78f1d942fc0f9b87df1 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Wed, 22 Apr 2009 00:20:29 +0000 Subject: 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 --- skia/skia.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'skia') diff --git a/skia/skia.gyp b/skia/skia.gyp index ae3cc55..5062420 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -571,7 +571,7 @@ 'sgl/SkTSort.h', 'sgl/SkTypeface.cpp', 'sgl/SkTypeface_fake.cpp', - #'sgl/SkUnPreMultiply.cpp', + 'sgl/SkUnPreMultiply.cpp', 'sgl/SkUtils.cpp', 'sgl/SkWriter32.cpp', 'sgl/SkXfermode.cpp', -- cgit v1.1