diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKit/wx/wxwk-settings.bkl | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKit/wx/wxwk-settings.bkl')
| -rw-r--r-- | WebKit/wx/wxwk-settings.bkl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebKit/wx/wxwk-settings.bkl b/WebKit/wx/wxwk-settings.bkl index 4328576..d51c18a 100644 --- a/WebKit/wx/wxwk-settings.bkl +++ b/WebKit/wx/wxwk-settings.bkl @@ -76,6 +76,7 @@ JavaScriptCore Bakefile project file. <if cond="FORMAT=='gnu'"> <include>$(WK_ROOT)/WebKitLibraries/unix/include</include> <lib-path>$(WK_ROOT)/WebKitLibraries/unix/lib</lib-path> + <lib-path>$(WK_ROOT)/WebKitLibraries</lib-path> </if> <if cond="FORMAT in ['msvc', 'msvs2005prj']"> <include>$(WK_ROOT)/WebKitLibraries/win/include</include> @@ -91,6 +92,13 @@ JavaScriptCore Bakefile project file. <if cond="FORMAT=='gnu'"> <ldflags>-ljpeg -lpng</ldflags> </if> + + <set var="WEBCORE_LIBS"> + <if cond="PLATFORM_OS=='mac'"> + WebKitSystemInterfaceTiger + </if> + </set> + <sys-lib>$(WEBCORE_LIBS)</sys-lib> <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> <if cond="PLATFORM_WIN32=='1'"> |