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

Unified Diff: Source/platform/blink_platform.gyp

Issue 68103014: Move some core/platform/graphics/mac files to geometry (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Export IntSize/IntPoint Created 7 years, 1 month 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/core/platform/graphics/mac/IntSizeMac.mm ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/blink_platform.gyp
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp
index b8e0893b72a5f0c2be7864c8f84f7b19e954b4af..6691a15a1ed635c8820b7c2ec3b1784a137e7fdc 100644
--- a/Source/platform/blink_platform.gyp
+++ b/Source/platform/blink_platform.gyp
@@ -86,6 +86,12 @@
'<(DEPTH)/third_party/angle_dx11/include',
'<(SHARED_INTERMEDIATE_DIR)/blink',
],
+ 'xcode_settings': {
+ # Some Mac-specific parts of WebKit won't compile without having this
+ # prefix header injected.
+ # FIXME: make this a first-class setting.
+ 'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h',
+ },
'sources': [
'<@(platform_files)',
@@ -115,6 +121,20 @@
# The Mac uses mac/KillRingMac.mm instead of the dummy
# implementation.
['exclude', 'KillRingNone\\.cpp$'],
+
+ ['include', 'geometry/mac/FloatPointMac\\.mm$'],
+ ['include', 'geometry/mac/FloatRectMac\\.mm$'],
+ ['include', 'geometry/mac/FloatSizeMac\\.mm$'],
+ ['include', 'geometry/mac/IntPointMac\\.mm$'],
+ ['include', 'geometry/mac/IntRectMac\\.mm$'],
+
+ ['include', 'geometry/cg/FloatPointCG\\.cpp$'],
+ ['include', 'geometry/cg/FloatRectCG\\.cpp$'],
+ ['include', 'geometry/cg/FloatSizeCG\\.cpp$'],
+ ['include', 'geometry/cg/IntPointCG\\.cpp$'],
+ ['include', 'geometry/cg/IntRectCG\\.cpp$'],
+ ['include', 'geometry/cg/IntSizeCG\\.cpp$'],
+
],
'defines': [
'WebFontCache=ChromiumWebCoreObjCWebFontCache',
@@ -122,6 +142,8 @@
}, { # OS!="mac"
'sources/': [
['exclude', 'mac/'],
+ ['exclude', 'geometry/mac/'],
+ ['exclude', 'geometry/cg/'],
],
}],
['OS=="win"', {
« no previous file with comments | « Source/core/platform/graphics/mac/IntSizeMac.mm ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698