From cbffa57351cdbdd189cf8251fdab0b62690fa33a Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Fri, 4 Feb 2011 12:52:36 -0800 Subject: fix linking to llqtwebkit. --- indra/cmake/WebKitLibPlugin.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake/WebKitLibPlugin.cmake') diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1f5b0f5d84..1cc02c1cac 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -35,6 +35,7 @@ else (STANDALONE) endif (STANDALONE) if (WINDOWS) + use_prebuilt_binary(qt) set(WEBKIT_PLUGIN_LIBRARIES debug llqtwebkitd debug QtWebKitd4 -- cgit v1.3 From 38a2af923561f8865976843c58a21f851695c9c2 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Thu, 10 Feb 2011 17:26:16 -0800 Subject: various fixes to get the debug build working; don't look for or copy msvc*80.dll's. --- autobuild.xml | 34 +++++----------------------------- indra/cmake/JsonCpp.cmake | 2 +- indra/cmake/WebKitLibPlugin.cmake | 1 - indra/newview/CMakeLists.txt | 15 ++++++--------- indra/newview/viewer_manifest.py | 2 +- 5 files changed, 13 insertions(+), 41 deletions(-) (limited to 'indra/cmake/WebKitLibPlugin.cmake') diff --git a/autobuild.xml b/autobuild.xml index 237ea4ad8d..eaf976ff8f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -908,9 +908,9 @@ archive hash - a668a4ddfe20a078d720d7a4fca205bd + afff2018e6a887c281b072eecdd9343e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220579/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110208.tar.bz2 name windows @@ -1066,7 +1066,7 @@ license lgpl license_file - LICENSES/LLQTWEBKIT_LICENSE.txt + LICENSES/llqtwebkit.txt name llqtwebkit platforms @@ -1100,9 +1100,9 @@ archive hash - 5744e07b1b775afd259f3916a436c54c + 7865b9c3a5d9f9424af56d5d05b82de9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110204.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/alain_llqtwebkit/rev/220864/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110210.tar.bz2 name windows @@ -1389,30 +1389,6 @@ - qt - - license - LGPL - license_file - LICENSES/qt.txt - name - qt - platforms - - windows - - archive - - hash - ad536aebb28e578164f58e3f7b53bbb1 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-qt/rev/220494/arch/CYGWIN/installer/qt-4.7.1-windows-20110207.tar.bz2 - - name - windows - - - quicktime license diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 4a129d7115..5e6672ecd4 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,7 +11,7 @@ else (STANDALONE) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES -# debug json_vc100_libmt + debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt) diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1cc02c1cac..1f5b0f5d84 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -35,7 +35,6 @@ else (STANDALONE) endif (STANDALONE) if (WINDOWS) - use_prebuilt_binary(qt) set(WEBKIT_PLUGIN_LIBRARIES debug llqtwebkitd debug QtWebKitd4 diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ef1d05a779..abba6f134d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1488,15 +1488,12 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/Release/fmod.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll ${SHARED_LIB_STAGING_DIR}/Debug/fmod.dll - ${SHARED_LIB_STAGING_DIR}/Release/msvcr80.dll - ${SHARED_LIB_STAGING_DIR}/Release/msvcp80.dll - ${SHARED_LIB_STAGING_DIR}/Release/Microsoft.VC80.CRT.manifest - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcr80.dll - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcp80.dll - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest - ${SHARED_LIB_STAGING_DIR}/Debug/msvcr80d.dll - ${SHARED_LIB_STAGING_DIR}/Debug/msvcp80d.dll - ${SHARED_LIB_STAGING_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest + ${SHARED_LIB_STAGING_DIR}/Release/msvcr100.dll + ${SHARED_LIB_STAGING_DIR}/Release/msvcp100.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcr100.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/msvcp100.dll + ${SHARED_LIB_STAGING_DIR}/Debug/msvcr100d.dll + ${SHARED_LIB_STAGING_DIR}/Debug/msvcp100d.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/SLVoice.exe ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp.dll diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ed7422433e..c11e5ed429 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -289,7 +289,7 @@ class WindowsManifest(ViewerManifest): # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx if self.args['configuration'].lower() == 'debug': self.path("msvcr100d.dll") - self.path("msvcp80d.dll") + self.path("msvcp100d.dll") else: self.path("msvcr100.dll") self.path("msvcp100.dll") -- cgit v1.3 From c41d9949d797312626d44c639766b285111d608b Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Mon, 14 Mar 2011 20:01:31 +0000 Subject: update llqtwebkit usage. --- autobuild.xml | 4 ++-- indra/cmake/WebKitLibPlugin.cmake | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/cmake/WebKitLibPlugin.cmake') diff --git a/autobuild.xml b/autobuild.xml index b5c4894841..2848a7e0f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1112,9 +1112,9 @@ archive hash - c05a33ee8b6f253b5a744596dfc3707d + f53e2a255d4c4039203de3e4640a2d41 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20101013.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/223655/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110314.tar.bz2 name linux diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 1f5b0f5d84..8fb717cdb8 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -62,10 +62,6 @@ elseif (LINUX) else (STANDALONE) set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit - - qgif - qjpeg - QtWebKit QtOpenGL QtNetwork -- cgit v1.3 From 616b0a25686b0ffbc5a995a26f27d5f46efc7024 Mon Sep 17 00:00:00 2001 From: "alain@945battery-guestA-183.lindenlab.com" Date: Wed, 23 Mar 2011 10:44:39 -0700 Subject: Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545). --- autobuild.xml | 4 ++-- indra/cmake/WebKitLibPlugin.cmake | 2 +- indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/cmake/WebKitLibPlugin.cmake') diff --git a/autobuild.xml b/autobuild.xml index 425a5d37c3..c6c087a6c3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1074,9 +1074,9 @@ archive hash - f53e2a255d4c4039203de3e4640a2d41 + ed7d6cb66e6fcd6dbac41aabe6a0d0c8 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-linux-20110314.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/224858/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110323.tar.bz2 name linux diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 8fb717cdb8..6e8f6cec7f 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,7 +67,7 @@ elseif (LINUX) QtNetwork QtGui QtCore - + jscore jpeg fontconfig X11 diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index d6f8ae3e16..e24ee6629e 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -1231,7 +1231,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) std::string url = message_in.getValue("url"); if ( 404 == code ) // browser lib only supports 404 right now { - LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#if LLQTWEBKIT_API_VERSION < 8 + LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#endif }; } else if(message_name == "set_user_agent") -- cgit v1.3 From 2f190297f0ff37452b3e966c0878e14a6aacc41b Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Wed, 30 Mar 2011 20:12:37 +0000 Subject: remove lib requirement not in current llqtwebkit linux archive. --- indra/cmake/WebKitLibPlugin.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/cmake/WebKitLibPlugin.cmake') diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 6e8f6cec7f..b599982afb 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,7 +67,6 @@ elseif (LINUX) QtNetwork QtGui QtCore - jscore jpeg fontconfig X11 -- cgit v1.3 From 926e506d0ad67e4ba9370efae60f5641c932b672 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Thu, 31 Mar 2011 16:17:12 +0000 Subject: d'oh, forgot to add back some q libs to the build when reverting to older linux package; here they are. --- indra/cmake/WebKitLibPlugin.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake/WebKitLibPlugin.cmake') diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index b599982afb..0f5a81c020 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,6 +67,8 @@ elseif (LINUX) QtNetwork QtGui QtCore + qgif + qjpeg jpeg fontconfig X11 -- cgit v1.3