2007-11-20 Alp Toker <alp@atoker.com>

        Reviewed by Simon Hausmann.

        Clean up GTK+ port configuration.

        Use similar compiler warning flags to the Mac build.

        Add the qmake changes needed for DirectFB support.

        * WebKit.pri:

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

diff --git a/ChangeLog b/ChangeLog
index f6644c507b4121ee43cc6066d36ea4735a39de74..2e57382a887a1cb466d32e99dd2025fc73b10544 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-20  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Simon Hausmann.
+
+        Clean up GTK+ port configuration.
+
+        Use similar compiler warning flags to the Mac build.
+
+        Add the qmake changes needed for DirectFB support.
+
+        * WebKit.pri:
+
 2007-11-07  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Mark.

diff --git a/WebKit.pri b/WebKit.pri
index 5cb215fc3a60402c5b5a01356fb602cfc026a1d8..57f3546c42aa140022472dfddbee03a2209d3da2 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -13,11 +13,29 @@ qt-port:!building-libs {
     LIBS += -lQtWebKit
     DEPENDPATH += $$PWD/WebKit/qt/Api
 }
-gtk-port:CONFIG += link_pkgconfig
-gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
-gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__
-gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng
-gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+
+gtk-port {
+    CONFIG += link_pkgconfig
+
+    DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
+
+    # We use FreeType directly with Cairo
+    PKGCONFIG += cairo-ft
+
+    directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
+    else: PKGCONFIG += cairo gtk+-2.0
+
+    # We use the curl http backend on all platforms
+    PKGCONFIG += libcurl
+
+    LIBS += -lWebKitGtk -ljpeg -lpng
+
+    QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+    QMAKE_LIBS += $$system(icu-config --ldflags)
+
+    # This set of warnings is borrowed from the Mac build
+    QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wundef
+}
 
 DEFINES += USE_SYSTEM_MALLOC
 CONFIG(release) {