diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-04-09 21:05:55 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-04-09 21:05:55 +0000 |
| commit | 6631dc22f0513b5ffe28ca48f95ee31fc684d195 (patch) | |
| tree | 3ace52fed5faf4bd1994dea9902967048d22a831 /indra/cmake | |
| parent | 20c963b42e19795d27f93b843003df6be6d3f9aa (diff) | |
All/Linux: Update llqtwebkit to latest all-shared lib build. Linux package
assembly updated to deal with Qt libraries and discrete codec and imageformat
plugins (which live under bin/llplugin). Functioning Linux viewer with MoaP
support with a few image problems (sRGB profile, zlib errors). Much of this
expected to be due to the new 1.6.8/1.2.8 libpng/libz and we'll fix as needed.
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/WebKitLibPlugin.cmake | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index d9df78bfc8..9c4579ecf3 100755 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -53,8 +53,18 @@ if (WINDOWS) ) elseif (DARWIN) set(WEBKIT_PLUGIN_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib - debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtOpenGL.4.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtNetwork.4.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtGui.4.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtCore.4.dylib + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtOpenGL.4.dylib + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtNetwork.4.dylib + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtGui.4.dylib + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtCore.4.dylib ) elseif (LINUX) set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES}) @@ -70,7 +80,7 @@ elseif (LINUX) QtNetwork QtGui QtCore - jscore +# jscore # qgif # qjpeg # jpeg |