[wx] Unreviewed build fix. Disable compilation of WebDOM file for now,
authorkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Aug 2012 18:41:33 +0000 (18:41 +0000)
committerkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Aug 2012 18:41:33 +0000 (18:41 +0000)
add the opentype directory, and remove old ATSUI files no longer in the tree.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@126457 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
wscript

index 4409b20..973e608 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-23  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Disable compilation of WebDOM file for now,
+        add the opentype directory, and remove old ATSUI files no longer in the tree.
+        
+        * wscript:
+
 2012-08-22  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 
         [EFL] Use WTF_USE_SOUP instead BUILDING_SOUP__
diff --git a/wscript b/wscript
index a667613..83fe505 100644 (file)
--- a/wscript
+++ b/wscript
@@ -169,6 +169,7 @@ def build(bld):
                     os.path.join(wk_root, 'Source', 'JavaScriptCore'),
                     os.path.join(wk_root, 'Source', 'WebCore'),
                     os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'),
+                    os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'graphics', 'opentype'),
                     os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'image-decoders'),
                     os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'win'),
                     os.path.join(wk_root, 'Source', 'WebCore', 'workers'),
@@ -238,9 +239,7 @@ def build(bld):
                    'Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp',
                    'Source/WebCore/platform/graphics/mac/ComplexTextController.cpp',
                    'Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm',
-                   'Source/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp',
                    'Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp',
-                   'Source/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm',
                    'Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp',
                    'Source/WebCore/platform/graphics/wx/FontPlatformDataWxMac.mm',
                    'Source/WebCore/platform/wx/wxcode/mac/carbon/fontprops.mm',
@@ -382,6 +381,9 @@ def build(bld):
         excludes.append('WebNativeNodeFilterCondition.cpp')
         excludes.append('WebDOMNodeFilterCustom.cpp')
         
+        # don't compile for now until we figure out the issue with using DOMStringList
+        excludes.append('WebDOMInternals.cpp')
+        
         # this file is unused by any port, not sure why it was
         # left in the tree
         excludes.append('GeneratedImage.cpp')