diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-10-05 12:43:03 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-10-05 12:43:03 +0000 |
| commit | fb5a8ff3d88fca827e22ad48f136c7fe1c6cea10 (patch) | |
| tree | f28b9b4a860576cf9909d567efc7baeb20dd2740 /packages/webkit/files/WebKit.pri | |
| parent | f0f72d8aa5de6a41796117c6e781e150bbacbe47 (diff) | |
| parent | bab0c48ac5132ad63b4f3da27a1c39c20b5db86c (diff) | |
merge of 'aac60b186b977130a688c4d00bfde913fb6221eb'
and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'
Diffstat (limited to 'packages/webkit/files/WebKit.pri')
| -rw-r--r-- | packages/webkit/files/WebKit.pri | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 0375102a0c..350c95d311 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) { @@ -23,12 +26,12 @@ CONFIG(release) { BASE_DIR = $$PWD qt-port:INCLUDEPATH += \ $$PWD/WebKitQt/Api -gdk-port:INCLUDEPATH += \ - $$BASE_DIR/WebCore/platform/gdk \ +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 += \ |