Changeset 81339 in webkit

Timestamp:

Mar 17, 2011 1:35:28 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-03-17 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Add more ObjC++ files to the build
​https://bugs.webkit.org/show_bug.cgi?id=56548

96 link errors.

• WebCore.gypi:
• gyp/WebCore.gyp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• gyp/WebCore.gyp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-17  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Add more ObjC++ files to the build
+        https://bugs.webkit.org/show_bug.cgi?id=56548
+
+        96 link errors.
+
+        * WebCore.gypi:
+        * gyp/WebCore.gyp:
+
 2011-03-17  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -3953 +3953 @@
             'platform/mac/RuntimeApplicationChecks.h',
             'platform/mac/RuntimeApplicationChecks.mm',
-            'platform/mac/SSLKeyGeneratorMac.mm',
             'platform/mac/SchedulePairMac.mm',
             'platform/mac/ScrollAnimatorMac.h',

trunk/Source/WebCore/gyp/WebCore.gyp

@@ -48 +48 @@
       'sources/': [
         # FIXME: Figure out how to build these mm files.
-        ['exclude', 'platform/mac/[^/]+.mm$'],
         ['exclude', 'DerivedSources/.*\\.mm$'],
+
+        # FIXME: These need to be built, but they're hard.
+        ['exclude', 'platform/mac/DragDataMac.mm$'],
+        ['exclude', 'platform/mac/HTMLConverter.mm$'],
+        ['exclude', 'platform/mac/PasteboardMac.mm$'],
+        ['exclude', 'platform/mac/WebCoreObjCExtras.mm$'],
 
         ['exclude', 'bindings/[^/]+/'],
@@ -55 +60 @@
         ['include', 'bindings/js/'],
         # FIXME: Build bindings/objc/
-        ['exclude', 'bindings/objc/'],
         ['exclude', 'bindings/js/ScriptControllerMac\\.mm$'],
-        ['include', 'bindings/objc/DOMInternal\\.h$'],
+        ['include', 'bindings/objc/[^/]+\\.h$'],
 
         # FIXME: This could should move to Source/ThirdParty.
@@ -64 +68 @@
         # FIXME: Figure out how to store these patterns in a variable.
         ['exclude', '(android|brew|cairo|chromium|curl|efl|freetype|fftw|gstreamer|gtk|haiku|linux|mkl|openvg|pango|posix|qt|skia|soup|symbian|texmap|iphone|v8|win|wince|wx)/'],
-        ['exclude', '(Android|Brew|Cairo|CF|CG|Curl|Chromium|Efl|Haiku|Gtk|JSC|Linux|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|V8|Win|WinCE|Wx)\\.(cpp|mm?)$'],
+        ['exclude', '(Android|Brew|Cairo|CF|Curl|Chromium|Efl|Haiku|Gtk|JSC|Linux|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|V8|Win|WinCE|Wx)\\.(cpp|mm?)$'],
         ['exclude', 'Chromium[^/]*\\.(cpp|mm?)$'],