diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-12 13:53:40 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-12 13:54:12 (GMT) |
| commit | a6905066d18c29c55944653678e85698c9babc6e (patch) | |
| tree | 6965e23c24d3f18ff7952f3bc04df32068c1affc /src/script | |
| parent | bbadec8c68d930a4cb9f45835aa7d1659620cdc3 (diff) | |
| download | Qt-a6905066d18c29c55944653678e85698c9babc6e.zip Qt-a6905066d18c29c55944653678e85698c9babc6e.tar.gz Qt-a6905066d18c29c55944653678e85698c9babc6e.tar.bz2 | |
Make it possible to build QtScript against JavaScriptCore from an external directory
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/webkit.pri | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/src/script/webkit.pri b/src/script/webkit.pri index d15c824..24e877f 100644 --- a/src/script/webkit.pri +++ b/src/script/webkit.pri @@ -1,28 +1,39 @@ # disable JIT for now DEFINES += ENABLE_JIT=0 # FIXME: shared the statically built JavaScriptCore -include($$PWD/../3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri) -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/parser -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/bytecompiler -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/debugger -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/runtime -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/wtf -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/unicode -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/interpreter -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/jit -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/profiler -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/wrec -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/API -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/bytecode -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/assembler -INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/generated +# Fetch the base WebKit directory from the WEBKITDIR environment variable; +# fall back to src/3rdparty otherwise +WEBKITDIR = $$(WEBKITDIR) +isEmpty(WEBKITDIR) { + WEBKITDIR = $$PWD/../3rdparty/webkit + # FIXME: not needed once JSCBISON works + # TODO: or leave it like this since the generated file is available anyway? + SOURCES += $$WEBKITDIR/JavaScriptCore/generated/Grammar.cpp +} else { + CONFIG += building-libs + CONFIG -= QTDIR_build + include($$WEBKITDIR/WebKit.pri) +} -# FIXME: not needed once JSCBISON works -# TODO: or leave it like this since the generated file is available anyway? -SOURCES += $$PWD/../3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp +include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) + +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/debugger +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/runtime +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wtf +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/unicode +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/interpreter +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/jit +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/profiler +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wrec +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/API +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated DEFINES += BUILDING_QT__=1 DEFINES += USE_SYSTEM_MALLOC |