diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:33:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:33:28 +0000 |
| commit | 6e90aae26efa66553063b74b9afa9563b70fb982 (patch) | |
| tree | dc0273068963d8e57f48f75875e5236153cf1cd9 /packages/webkit/files | |
| parent | 496d5415774f03b6e09aee17763ac9432d9c2755 (diff) | |
| parent | 62007cb1fac3e5a7f4a09b61c7d3c3b7cd5fc8a7 (diff) | |
merge of '55c714e37be4606a4166b3df883d5f404d3889bf'
and 'd714000fc8a6b75093a93f01782724b65d31eac1'
Diffstat (limited to 'packages/webkit/files')
| -rw-r--r-- | packages/webkit/files/WebKit.pri | 27 | ||||
| -rw-r--r-- | packages/webkit/files/WebKit.pro | 17 |
2 files changed, 25 insertions, 19 deletions
diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 0375102a0c..0c47afe7fd 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -6,14 +6,17 @@ isEmpty(OUTPUT_DIR) { CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug } -!gdk-port:CONFIG += qt-port +!gtk-port:CONFIG += qt-port qt-port:DEFINES += BUILDING_QT__=1 -qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit -gdk-port:CONFIG += link_pkgconfig -gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl -gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__ -gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng -lcurl -gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) +qt-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lQtWebKit +} +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) DEFINES += USE_SYSTEM_MALLOC CONFIG(release) { @@ -22,13 +25,13 @@ CONFIG(release) { BASE_DIR = $$PWD qt-port:INCLUDEPATH += \ - $$PWD/WebKitQt/Api -gdk-port:INCLUDEPATH += \ - $$BASE_DIR/WebCore/platform/gdk \ + $$PWD/WebKit/qt/Api +gtk-port:INCLUDEPATH += \ + $$BASE_DIR/WebCore/platform/gtk \ $$BASE_DIR/WebCore/platform/network/curl \ $$BASE_DIR/WebCore/platform/graphics/cairo \ - $$BASE_DIR/WebCore/loader/gdk \ - $$BASE_DIR/WebCore/page/gdk \ + $$BASE_DIR/WebCore/loader/gtk \ + $$BASE_DIR/WebCore/page/gtk \ $$BASE_DIR/WebKit/gtk/Api \ $$BASE_DIR/WebKit/gtk/WebCoreSupport INCLUDEPATH += \ diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro index 335d11e6e7..dca2614109 100644 --- a/packages/webkit/files/WebKit.pro +++ b/packages/webkit/files/WebKit.pro @@ -1,13 +1,16 @@ TEMPLATE = subdirs CONFIG += ordered -!gdk-port:CONFIG += qt-port -qt-port:SUBDIRS += WebKitQt/Plugins +!gtk-port:CONFIG += qt-port +qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins SUBDIRS += \ WebCore \ JavaScriptCore/kjs/testkjs.pro -qt-port:SUBDIRS += \ - WebKitQt/QtLauncher \ - WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro -gdk-port:SUBDIRS += \ - WebKitTools/GdkLauncher +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} + +gtk-port:SUBDIRS += \ + WebKitTools/GtkLauncher |