aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Dunno how this file got missed.David Seikel2011-03-201-0/+16
|
* Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-205-4/+279
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Fixed missing use_prebuilt_binary(gstreamer-plugins) from ↵McCabe Maxsted2011-03-151-3/+4
| | | | | | | | GStreamer010Plugin.cmake and fixed some out-of-date lib requirements for Windows
| * Fixed typo in 425b474McCabe Maxsted2011-03-141-1/+1
| |
| * Added info message when cmake can't find the quicktime sdkMcCabe Maxsted2011-03-141-0/+2
| |
| * Added cmake files to the solution. This should've been done AGES agoMcCabe Maxsted2011-03-142-0/+149
| |
| * Updated copywinlibs and staging to use the new set of gstreamer libsMcCabe Maxsted2011-03-091-0/+122
| |
| * Fixed being unable to change streaming audio volume on WindowsMcCabe Maxsted2011-03-091-1/+2
| |
* | Look for more versions of python. Isn't pythen wonderful like that? Noooot!David Seikel2011-03-021-5/+6
| |
* | Merge branch 'branding' into weekly, with some post merge branding tweeks.David Seikel2011-03-015-29/+14
|\ \ | |/ |/|
| * Merge branch 'weekly' into brandingDavid Seikel2011-02-202-10/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * | UNBRANDING! Conservativley remove references to "second life", replacing ↵David Seikel2011-02-132-4/+4
| | | | | | | | | | | | them with something generic.
| * | One part of the system does not like the meta-impy name. Seems to be an ↵David Seikel2011-02-111-1/+2
| | | | | | | | | | | | unused part though, so take the lazy way out.
| * | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-094-9/+9
| | | | | | | | | | | | | | | | | | need to be reverted later. Changed file names to.
| * | Artwork and font files in the repo now.David Seikel2011-02-081-16/+0
| | | | | | | | | | | | | | | My policy is to have it all in the repo. None of this downloading pre built stuff from people with no guarantee that they will still have the files a month from now. Been burnt with that before.
* | | Switched to Phoenix Viewers Boost 1.43 libs for WindowsPatrick Sapinski2011-02-271-3/+1
| |/ |/|
* | Fixed cmake using the old windows gstreamer plugin libsMcCabe Maxsted2011-02-181-4/+4
| |
* | Make media_plugin_gstreamer010 find all its headers correctly on Windows ↵McCabe Maxsted2011-02-101-5/+13
| | | | | | | | (notes: need to add archives for iconv and gstreamer to install.xml, doesn't link yet)
* | Updated windows version of boost to the 1.39 version used in Snowglobe 1.5. ↵McCabe Maxsted2011-02-101-1/+3
|/ | | | Note: only VS2005 libs currently included
* Disable SSE4 on Mac (temporarily).Jacek Antonelli2010-11-131-2/+2
| | | | GCC 4.0 on Mac OS X 10.5 can't handle SSE4, GCC 4.2 fails.
* Fixed fontconfig library not being set for Linux-onlyMcCabe Maxsted2010-11-121-3/+5
|
* Add support for using ld.gold on linux.Aleric Inglewood2010-11-122-3/+14
| | | | | | | | | | To use ld.gold configure with: -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold". ld.gold links the viewer on my machine in 8 seconds, as opposed to 19 seconds with ld.bfd. Moreover, it uses a LOT less memory during linking (about 750 MB instead of 2.5 GB!). Thanks to Siana Gearz for pointing out that ld.gold is so much faster.
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-074-23/+18
| | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* Deleted OPENAL.cmake.imp fileMcCabe Maxsted2010-11-021-115/+0
|
* Added missing qtxmlpatterns4.dll to CopyWinLibs.cmakeMcCabe Maxsted2010-11-021-0/+4
|
* Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-282-13/+7
|\
| * Merge branch 'weekly' of http://github.com/imprudence/imprudence into weeklyAleric Inglewood2010-10-282-13/+7
| |\
| | * Changed default compile settings for Mac. Now SSE3 and SSE4 are enabled by ↵elektrahesse2010-10-182-13/+7
| | | | | | | | | | | | default, gcc-4.2 is used and 10.5 SDK is auto selected. Build from commandline in Release mode now work perfectly (./develop.py -t Release build) without the need for Xcode at all.
* | | Load prebuilt glib when needed. Don't compile gstreamer plugin on windows.Aleric Inglewood2010-10-273-7/+11
| | | | | | | | | | | | | | | Also, darwin doesn't use quicktime, so disabled compiling that plugin for darwin.
* | | Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-261-0/+8
|\ \ \
| * \ \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-251-0/+8
| |\ \ \ | | |/ /
| | * | Download prebuilt vivox (and 32bitcompatibilitylibs on 64bit) even when ↵Aleric Inglewood2010-10-251-0/+8
| | |/ | | | | | | | | | using standalone.
* | | Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer loading ↵McCabe Maxsted2010-10-261-0/+2
| | | | | | | | | | | | can be sorted on windows
* | | Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-231-0/+2
|\ \ \ | |/ /
| * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
| | * Added detection for Python 2.7 (currently untested)McCabe Maxsted2010-10-161-0/+2
| | |
| | * Merge branch 'weekly' of git://github.com/mccabe/imprudence into weeklyelektrahesse2010-10-101-0/+1
| | |\
| | | * Use all those cores for compileRobin Cornelius2010-10-091-0/+1
| | | |
| | * | Removed not needed libgio-2.0 dependency on OSXelektrahesse2010-10-091-1/+0
| | |/
* | | Fixed copy_win_libs by removing glib dllsMcCabe Maxsted2010-10-231-8/+0
|/ /
* | Forgot QtWebKit and Qt plugins in last commit.Aleric Inglewood2010-10-181-2/+14
| | | | | | | | | | Standalone now works (I have no idea why it worked before, since obviously I tested it before committing the previous commit).
* | Find Qt4 with find_package on STANDALONE.Aleric Inglewood2010-10-171-1/+11
| | | | | | | | | | | | If Qt is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running imprudence of course (or the webkit plugin will silently fail).
* | RED-595: Manual merge with weekly-webkit.Aleric Inglewood2010-10-152-18/+82
| | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml.
* | Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-1019-323/+596
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| * | Let the gstreamer plugin build on windowsRobin Cornelius2010-10-101-5/+24
| | |
| * | linux* kill imprudence gstreamer, use system gstreamer instead.Armin Weatherwax2010-09-232-122/+12
| | | | | | | | | | | | | | | who ever builds a release with that needs to consider to install some really old gstreamer at /usr/local/lib - lenny has 0.10.19
| * | update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not ↵Armin Weatherwax2010-09-231-0/+28
| | | | | | | | | | | | | | | | | | loading. Issue: llqtwebkit needs update for Linux 64bit
| * | Robin Cornelius: fixes for building plugins on Linux 64bitArmin Weatherwax2010-09-232-1/+20
| | |
| * | Added fix for word size from Snowglobe (only for Windows--didn't update ↵McCabe Maxsted2010-09-231-0/+1
| | | | | | | | | | | | Linux or Mac as I can't test them)
| * | CMake now runs correctly on WindowsMcCabe Maxsted2010-09-231-0/+16
| | |
generated by cgit v1.1 at 2025-02-21 23:12:08 +0000