From 0051cc02f16be141cf7085e4f3ab719602fe3c63 Mon Sep 17 00:00:00 2001 From: "abarth@webkit.org" Date: Sat, 31 Mar 2012 03:24:06 +0000 Subject: [PATCH] Attempt to fix the Windows component build. The way we link the unit tests in the component build is kind of nutty. Hopefully this approach will eliminate the duplicate symbols we've been seeing. * WebKitUnitTests.gyp: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112768 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/chromium/ChangeLog | 8 ++++++++ Source/WebKit/chromium/WebKitUnitTests.gyp | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index 6256761..8a494b8 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,11 @@ +2012-03-30 Adam Barth + + Attempt to fix the Windows component build. The way we link the unit + tests in the component build is kind of nutty. Hopefully this approach + will eliminate the duplicate symbols we've been seeing. + + * WebKitUnitTests.gyp: + 2012-03-30 Emil A Eklund Change WebKit/WebKit2 platform code to use pixel snapped values diff --git a/Source/WebKit/chromium/WebKitUnitTests.gyp b/Source/WebKit/chromium/WebKitUnitTests.gyp index d50ad15..2eb0d34 100644 --- a/Source/WebKit/chromium/WebKitUnitTests.gyp +++ b/Source/WebKit/chromium/WebKitUnitTests.gyp @@ -55,7 +55,6 @@ 'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD', 'dependencies': [ 'WebKit.gyp:webkit', - '../../WebCore/WebCore.gyp/WebCore.gyp:webcore', '<(chromium_src_dir)/testing/gtest.gyp:gtest', '<(chromium_src_dir)/testing/gmock.gyp:gmock', '<(chromium_src_dir)/base/base.gyp:base', @@ -78,6 +77,9 @@ 'WEBKIT_DLL_UNITTEST', ], }, { + 'dependencies': [ + '../../WebCore/WebCore.gyp/WebCore.gyp:webcore', + ], 'sources': [ '<@(webkit_unittest_files)', ], -- 2.7.4