summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/webkit/files/WebKit.pri5
-rw-r--r--meta/packages/webkit/webkit.inc8
2 files changed, 11 insertions, 2 deletions
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/packages/webkit/files/WebKit.pri
index 0c47afe7f..514023de5 100644
--- a/meta/packages/webkit/files/WebKit.pri
+++ b/meta/packages/webkit/files/WebKit.pri
@@ -33,7 +33,10 @@ gtk-port:INCLUDEPATH += \
$$BASE_DIR/WebCore/loader/gtk \
$$BASE_DIR/WebCore/page/gtk \
$$BASE_DIR/WebKit/gtk/Api \
- $$BASE_DIR/WebKit/gtk/WebCoreSupport
+ $$BASE_DIR/WebKit/gtk/WebView \
+ $$BASE_DIR/WebKit/gtk/WebCoreSupport \
+ $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
+ $$BASE_DIR
INCLUDEPATH += \
$$BASE_DIR/JavaScriptCore/ \
$$BASE_DIR/JavaScriptCore/kjs \
diff --git a/meta/packages/webkit/webkit.inc b/meta/packages/webkit/webkit.inc
index 2ff61091c..81c2d91bf 100644
--- a/meta/packages/webkit/webkit.inc
+++ b/meta/packages/webkit/webkit.inc
@@ -34,7 +34,13 @@ do_configure() {
do_compile_prepend() {
mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
cd ${S}/JavaScriptCore/pcre
- ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+ if test -e dftables.c
+ then
+ ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+ elif test -e dftables.cpp
+ then
+ ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
+ fi
cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
cd ${S}/WebKitBuilds/Debug
}