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

Unified Diff: Source/wtf/wtf.gyp

Issue 15861022: Build WTF as dll in component build (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix AutoDrainedPool ctor and ThreadSpecificThreadExit exports Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/wtf/unicode/UTF8.h ('k') | Source/wtf/wtf.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/wtf.gyp
diff --git a/Source/wtf/wtf.gyp b/Source/wtf/wtf.gyp
index f42496ce720d6bb274d49e7ad22d8479f3300158..59115d50ec647b8e2838576fafce86fe35b88ffa 100644
--- a/Source/wtf/wtf.gyp
+++ b/Source/wtf/wtf.gyp
@@ -74,22 +74,21 @@
},
{
'target_name': 'wtf',
- 'type': 'static_library',
+ 'type': '<(component)',
'include_dirs': [
'..',
- '../Platform/chromium'
],
'dependencies': [
'wtf_config',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
],
- 'defines': [
- 'WEBKIT_IMPLEMENTATION=1',
- ],
'sources': [
'<@(wtf_files)',
],
+ 'defines': [
+ 'WTF_IMPLEMENTATION=1',
+ ],
'direct_dependent_settings': {
'include_dirs': [
'..',
@@ -140,7 +139,14 @@
['exclude', 'Win\\.cpp$'],
],
}],
- ['OS!="mac"', {
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
+ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+ ]
+ }
+ }, { # OS!="mac"
'sources/': [
['exclude', 'Mac\\.mm$'],
# mac is the only OS that uses WebKit's copy of TCMalloc.
« no previous file with comments | « Source/wtf/unicode/UTF8.h ('k') | Source/wtf/wtf.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698