summaryrefslogtreecommitdiff
path: root/indra/llplugin/CMakeLists.txt
AgeCommit message (Collapse)Author
2016-12-01DRTVWR-418: Until we figure out how to say FIXED:NO to linker, don't.Nat Goodspeed
The present CMake logic wants to pass FIXED:NO to the linker for 64-bit builds, which on the face of it seems like a Good Thing: it permits code to be relocated in memory, preventing collisions if two libraries happen to want to load into overlapping address ranges. However the way it's being specified is wrong and harmful. Passing /FIXED:NO to the compiler command line engages /FI (Forced Include!) of a nonexistent file XED:NO -- producing lots of baffling fatal compile errors. Thanks Callum for diagnosing this!
2016-11-15DRTVWR-418: Fold windows64 into windows platform with new autobuild.Nat Goodspeed
autobuild 1.1 now supports expanding $variables within a config file -- support that was explicitly added to address this very problem. So now the windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE, $AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle most of the deltas between the windows platform and windows64. This permits removing the windows64 platform definition from autobuild.xml. The one remaining delta between the windows64 and windows platform definitions was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-04-04merge with 4.0.3-releaseOz Linden
2016-01-20OPEN-312: Removed add_dependency entries for items listed in ↵Rider Linden
target_link_libraries. Superfluous.
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-02MAINT-5687: Remove old webkit from the make files and the repo. Ensure that ↵Rider Linden
it is no longer meaningfully referenced.
2015-03-24Refer to new QuickTime third party package with fixes for VS2013 & re-add ↵callum_linden
QuickTime media plugin
2015-01-07First cut at consuming new slplugins autobuild package.Nat Goodspeed
The contents are extracted, but not yet built into the viewer installer.
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-10-11Updating linux build to gcc4.6Don Kjer
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-15VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.Aleric Inglewood
If Qt and/or llqtwebkit is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running the viewer of course (or the webkit plugin will silently fail).
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-09-30Put some errant tests under if (LL_TESTS) conditional.Dave Parks
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-16Merged VWR-23047 (SNOW-512, -fPIC for 64bit) and follow-ups (VWR-20911 & ↵Boroondas Gupte
SNOW-748)
2010-08-31SNOW-748 FIXED Building on OSX 10.6 fails with "warning: -mdynamic-no-pic ↵Boroondas Gupte (original patches by Aimee Linden)
overrides - fpic or -fPIC" Originally commited at http://svn.secondlife.com/trac/linden/changeset/3499/projects/2010/snowglobe and http://svn.secondlife.com/trac/linden/changeset/3501 SVN changeset 3499 partially applied with --ignore-whitespace: Hunk #1 FAILED at 259. Hunk #2 FAILED at 265. 2 out of 2 hunks FAILED -- saving rejects to file indra/llcommon/CMakeLists.txt.rej patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). patching file indra/media_plugins/base/CMakeLists.txt patching file indra/media_plugins/gstreamer010/CMakeLists.txt patching file indra/media_plugins/example/CMakeLists.txt patching file indra/llplugin/CMakeLists.txt Manually applied to indra/llcommon/CMakeLists.txt (straight forward). SVN changeset 3501 applied with fuzz 1: patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). Hunk #2 succeeded at 39 with fuzz 1 (offset -8 lines). No further changes other than that.
2010-09-16SNOW-512/SNOW-287: Build of LLPlugin fails on 64bit linux due to non PIC ↵Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius)
code linking into the DSO Formatting, cleanup, and one minor change by Techwolf Lupindo. Minor change was a move of the hunk in indra/media_plugins/webkit/CmakeLists.txt to same area as the other plugins CmakeLists.txt files. daggyfied version of https://bitbucket.org/Techwolf/viewer-development/changeset/00bd21962052
2010-08-18VWR-20770 (SNOW-649) FIXED Missing LL_TESTS condition around llplugin unit testAimee Linden
2010-03-31Added unit test for LLPluginCookieStore.Monroe Linden
2010-03-26Implemented central storage mechanism for media plugin cookies.Monroe Linden
Added LLPluginCookieStore, which manages the central list of cookies. New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f). Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately. Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies. Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively). Reviewed by Richard at http://codereview.lindenlab.com/1006003
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:41:01 +0000