[webkit-changes] [149767] trunk/Tools

Wed, 08 May 2013 14:54:26 -0700

Title: [149767] trunk/Tools
Revision
149767
Author
[email protected]
Date
2013-05-08 14:56:08 -0700 (Wed, 08 May 2013)

Log Message

Tools: add new BlackBerry include dirs.
https://bugs.webkit.org/show_bug.cgi?id=115514

Patch by Alberto Garcia <[email protected]> on 2013-05-08
Reviewed by Rob Buis.

iType include dirs are missing, and HarfBuzz needs to be fixed.

* Scripts/webkitdirs.pm:
(blackberryCMakeArguments):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (149766 => 149767)


--- trunk/Tools/ChangeLog	2013-05-08 20:53:28 UTC (rev 149766)
+++ trunk/Tools/ChangeLog	2013-05-08 21:56:08 UTC (rev 149767)
@@ -1,3 +1,15 @@
+2013-05-08  Alberto Garcia  <[email protected]>
+
+        Tools: add new BlackBerry include dirs.
+        https://bugs.webkit.org/show_bug.cgi?id=115514
+
+        Reviewed by Rob Buis.
+
+        iType include dirs are missing, and HarfBuzz needs to be fixed.
+
+        * Scripts/webkitdirs.pm:
+        (blackberryCMakeArguments):
+
 2013-05-08  José Dapena Paz  <[email protected]> and Zan Dobersek  <[email protected]>
 
         [GTK] Plumb the Automake build system for the Battery Status API feature

Modified: trunk/Tools/Scripts/webkitdirs.pm (149766 => 149767)


--- trunk/Tools/Scripts/webkitdirs.pm	2013-05-08 20:53:28 UTC (rev 149766)
+++ trunk/Tools/Scripts/webkitdirs.pm	2013-05-08 21:56:08 UTC (rev 149767)
@@ -1031,7 +1031,7 @@
     push @cmakeExtraOptions, "-DENABLE_GLES2=1" unless $ENV{"DISABLE_GLES2"};
 
     my @includeSystemDirectories;
-    push @includeSystemDirectories, File::Spec->catdir($stageInc, "harfbuzz");
+    push @includeSystemDirectories, File::Spec->catdir($stageInc, "harfbuzzng");
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "imf");
     # We only use jpeg-turbo for device build
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "jpeg-turbo") if $arch=~/arm/;
@@ -1040,6 +1040,8 @@
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "platform", "graphics");
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "browser", "qsk");
     push @includeSystemDirectories, File::Spec->catdir($stageInc, "ots");
+    push @includeSystemDirectories, File::Spec->catdir($stageInc, "iType", "common");
+    push @includeSystemDirectories, File::Spec->catdir($stageInc, "iType", "port", "nto");
 
     my @cxxFlags;
     push @cxxFlags, "-Wl,-rpath-link,$stageLib";

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to