diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/JavaScriptCore/JavaScriptCore.pri | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.pri')
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri index a816c97..c1de599 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pri +++ b/Source/JavaScriptCore/JavaScriptCore.pri @@ -1,6 +1,6 @@ # JavaScriptCore - Qt4 build info -include(../../common.pri) +include(../common.pri) VPATH += $$PWD @@ -23,6 +23,7 @@ CONFIG(standalone_package): DEFINES *= NDEBUG JAVASCRIPTCORE_INCLUDEPATH = \ $$PWD \ $$PWD/.. \ + $$PWD/../ThirdParty \ $$PWD/assembler \ $$PWD/bytecode \ $$PWD/bytecompiler \ @@ -30,7 +31,6 @@ JAVASCRIPTCORE_INCLUDEPATH = \ $$PWD/interpreter \ $$PWD/jit \ $$PWD/parser \ - $$PWD/pcre \ $$PWD/profiler \ $$PWD/runtime \ $$PWD/wtf \ @@ -90,7 +90,8 @@ defineTest(addJavaScriptCoreLib) { QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR webkit2 { # FIXME Workaround for undefined reference linking issues until the build system gets redesigned - LIBS += -Wl,-whole-archive -l$$JAVASCRIPTCORE_TARGET -Wl,-no-whole-archive + mac: LIBS += -Wl,-all_load -l$$JAVASCRIPTCORE_TARGET -WL,-noall_load + else: LIBS += -Wl,-whole-archive -l$$JAVASCRIPTCORE_TARGET -Wl,-no-whole-archive } else { LIBS += -l$$JAVASCRIPTCORE_TARGET } @@ -113,3 +114,4 @@ defineTest(addJavaScriptCoreLib) { return(true) } + |