diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-08-31 17:16:21 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-08-31 17:16:21 +0000 |
| commit | 158946668a75a0dad7b53bc74fd2b6f8f4a4befc (patch) | |
| tree | fdbd74ca881f5dd386c84496e393504c6b7eacb5 /indra/cmake/WebKitLibPlugin.cmake | |
| parent | 6dbef5f2a41d5ee974b808b8e863d4f973dfa2c3 (diff) | |
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
Diffstat (limited to 'indra/cmake/WebKitLibPlugin.cmake')
| -rw-r--r-- | indra/cmake/WebKitLibPlugin.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index c84df2b839..9ec23e80ca 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -6,21 +6,21 @@ if (STANDALONE) set(WEBKITLIBPLUGIN OFF CACHE BOOL "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") else (STANDALONE) - use_prebuilt_binary(webkitlibplugin) + use_prebuilt_binary(llqtwebkit) set(WEBKITLIBPLUGIN ON CACHE BOOL "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") endif (STANDALONE) if (WINDOWS) set(WEBKIT_PLUGIN_LIBRARIES - debug llwebkitlibd + debug llqtwebkitd debug QtWebKitd4 debug QtOpenGLd4 debug QtNetworkd4 debug QtGuid4 debug QtCored4 debug qtmaind - optimized llwebkitlib + optimized llqtwebkit optimized QtWebKit4 optimized QtOpenGL4 optimized QtNetwork4 @@ -30,12 +30,12 @@ if (WINDOWS) ) elseif (DARWIN) set(WEBKIT_PLUGIN_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllwebkitlib.dylib - debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllwebkitlib.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib + debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ) elseif (LINUX) set(WEBKIT_PLUGIN_LIBRARIES - llwebkitlib + llqtwebkit qgif # qico @@ -53,6 +53,7 @@ elseif (LINUX) fontconfig X11 + Xrender GL # sqlite3 |