aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Ported SSE2 build target from Singularity, patch by Shyotl. Note that the ↵McCabe Maxsted2011-09-082-24/+111
| | | | package project still currently only supports 'Release'
* Updated the windows version of openal-soft to 1.13McCabe Maxsted2011-06-241-2/+2
|
* Merge branch 'viewerinfo' into nextJacek Antonelli2011-05-253-8/+58
|\
| * Coax Xcode into selecting the right build type by default.Jacek Antonelli2011-05-211-3/+6
| | | | | | | | | | | | This is accomplished by dynamically reordering the CMake variable CMAKE_CONFIGURATION_TYPES so that the current build type (the value of CMAKE_BUILD_TYPE) is listed first.
| * Ported Linux packaging system from Kokua.Jacek Antonelli2011-05-201-0/+32
| | | | | | | | Run "make package" in the build directory to create a tarball.
| * Ported viewer_info.py and BuildVersion.cmake from Kokua.Jacek Antonelli2011-05-191-5/+20
| | | | | | | | | | | | | | viewer_info.py provides a way to easily query the viewer name and version (from viewerinfo.cpp). It replaces build_version.py, which has been removed. BuildVersion.cmake has been updated to use viewer_info.py instead of build_version.py.
* | Merge remote-tracking branch 'mccabe/1.4.0-fbeta-prefs_reorg' into nextJacek Antonelli2011-05-251-0/+4
|\ \ | |/ |/|
| * Added DirectX SDKs june 2010 and march 2009 to cmakeMcCabe Maxsted2011-04-261-0/+4
| |
* | Merge branch '1.3-maint' into nextJacek Antonelli2011-05-182-0/+19
|\ \ | |/ |/| | | | | | | | | Conflicts: linden/indra/llcommon/CMakeLists.txt linden/indra/newview/llvoavatar.cpp linden/indra/newview/viewer_manifest.py
| * Linux64 fix linking and packaging of the new ogg/vorbis libsArmin Weatherwax2011-05-171-0/+16
| |
| * also link with ld.goldArmin Weatherwax2011-05-171-0/+3
| | | | | | | | thanks to Aleric and Siana for the idea
| * gio-2.0 is not used on Mac.Jacek Antonelli2011-02-221-1/+0
| |
| * IMP-429: Link against prebuilt libraries / always use gtk-related system ↵Aleric Inglewood2011-01-172-0/+4
| | | | | | | | | | | | libs (linux) (cherry picked from commit a3cffd06a0e7aa92e1b6c28e7bad655b7085296c)
| * Fixed (again) how libjpeg is found on Mac. (#256/#464)Jacek Antonelli2010-10-031-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | Related information from Nemurimasu Neiro: stay away from find_library! due to an undocumented feature of find_xxx functions in CMake, no additional libraries may be found after the first call to a find_xxx function that searches the prebuilt libraries folder. CMake will request the folder contents *at most once* and libraries added by install.py will be missed.
| * Added empty indra/cmake/CMakeLists.txt to suppress a CMake 2.8 warning.Jacek Antonelli2010-09-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CMake Warning (dev) at CMakeLists.txt:36 (add_subdirectory): The source directory /home/jacek/imprudence/linden/indra/cmake does not contain a CMakeLists.txt file. CMake does not support this case but it used to work accidentally and is being allowed for compatibility. Policy CMP0014 is not set: Input directories must have CMakeLists.txt. Run "cmake --help-policy CMP0014" for policy details. Use the cmake_policy command to set the policy and suppress this warning. This warning is for project developers. Use -Wno-dev to suppress it."
| * linux64: move cxx flags from external script into 00-Common.cmake for ↵Armin Weatherwax2010-09-171-1/+17
| | | | | | | | | | | | transparency todo: do it less hacky
| * fix: 32bit libs for linux64 are not actually downloadedArmin Weatherwax2010-09-161-2/+2
| |
| * linux64: fetch 32 bit libraries required for voiceArmin Weatherwax2010-09-161-0/+3
| |
| * Added a fallback for CMake JPEG_LIBRARIES on Mac.Jacek Antonelli2010-09-161-1/+4
| |
| * fix libjpeg linking on Mac OSNemurimasu Neiro2010-09-161-1/+5
| | | | | | | | | | my custom builds were linking against /usr/local/lib/libjpeg.8.dylib and causing a version mismatch error when trying to use JPEGs
| * Added fonts package to install.xml.Jacek Antonelli2010-09-101-0/+2
| | | | | | | | Contains DejaVu Sans Condensed, Liberation Sans, and Vera Mono.
| * Added AAC decoding to GStreamer for WindowsMcCabe Maxsted2010-08-261-0/+4
| |
| * Updated windows version of openal-soft to 1.12.854McCabe Maxsted2010-08-261-2/+2
| |
| * Re-added voice in CopyWinLibs.cmake and viewer_manifest.pyMcCabe Maxsted2010-08-261-0/+33
| |
* | 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
| |
* | 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.
generated by cgit v1.1 at 2024-11-16 10:00:33 +0000