aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake (follow)
Commit message (Collapse)AuthorAgeFilesLines
* More post merge cleanups, make it compile under Windows.David Walter Seikel2013-09-026-4/+29
|
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-304-18/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same. Conflicts: .gitignore linden/indra/develop.py linden/indra/llcommon/llsdserialize_xml.cpp linden/indra/newview/CMakeLists.txt Manually combined MOAP, OTR, and WL changes from both. linden/indra/newview/app_settings/default_grids.xml Manually merged the grid collection. Also updated IG info. linden/indra/newview/hippoupdate.cpp linden/indra/newview/llettherebelight.cpp Just used the Imprudence copy. linden/indra/newview/llviewermessage.cpp Keep unbranding. linden/indra/newview/llvoavatar.cpp Manually merge client tags. linden/indra/newview/res/viewerRes.rc Manually merge version from Impy. linden/indra/newview/skins/dark/colors_base.xml Keep unbranding. linden/indra/newview/skins/default/html/unabletoconnect.png linden/indra/newview/skins/default/textures/icon_top_pick.tga linden/indra/newview/skins/default/xui/en-us/floater_about.xml Manual merging of contributors. linden/indra/newview/skins/gemini/colors_base.xml Keep unbranding. linden/indra/newview/skins/gemini/textures/icon_top_pick.tga linden/indra/newview/viewer_manifest.py Manually merged boost, gstreamer, OTR, and name. linden/indra/newview/viewerinfo.cpp Manually merge the comment.
| * Make nmake builds more like VS builds.David Walter Seikel2013-04-261-0/+5
| | | | | | | | Still some tweaking to go, therefore, still some rough bits in this.
| * Apply various Mac build patches from Mimika Oh and Nemurimasu Neiro to fix ↵David Walter Seikel2012-03-141-1/+10
| | | | | | | | up http://redmine.kokuaviewer.org/issues/598 and http://redmine.kokuaviewer.org/issues/602
| * Merge the artwork and font "prebuilt" packages into the source repo, as ↵David Walter Seikel2012-03-012-17/+0
| | | | | | | | | | | | | | | | discussed on IRC and the mailing list, and remove some SL logos. I know, there are two slightly different LICENSE-logos.txt files. One that was originally in the source repo, one that was from the artwork package. I'm a coder, not a lawyer, and not the owner of those copyrights, so left them as is.
* | Merge branch 'next' of git://github.com/ArminW/imprudence into nextDavid Walter Seikel2011-12-056-19/+61
|\ \ | |/ | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py Conflicted with the OTR stuff, simple fix.
| * Linux: allow cross compiling the 32bit viewer on a x86_64 platformArmin Weatherwax2011-11-132-2/+33
| | | | | | | | | | | | | | | | to do so: (have anything for crosscompiling installed), export WORD_SIZE='32' before configuring and/or building. Be aware: Mixing several platforms in one root directory probably wont work (didn't try though). Cross compiling the 64bit viewer on a i686 platform isn't tested, but probably will work using export WORD_SIZE='64'
| * use qt/webkit 4.7.4 on linuxArmin Weatherwax2011-11-132-3/+10
| |
| * Linux: remove libxml2 dependency.Armin Weatherwax2011-11-131-7/+16
| | | | | | | | | | This might also be possible on other platforms, the newer your gstreamer is, the easier to get rid of libxml2.
| * Linux: update OpenAL to 1.13.0Armin Weatherwax2011-11-131-6/+0
| | | | | | | | | | for Linux64 the 32bit compatibility libs (32bit openal et al.) are now integrated into the openal package.
| * Linux64: don't use -ffast-math for release builds, it didn't do anything for us.Armin Weatherwax2011-11-131-1/+2
| | | | | | | | But lloctree crashes teleporting to mega regions using -ffast-math .
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2011-12-032-11/+97
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious. Conflicts: .gitignore linden/indra/cmake/00-Common.cmake linden/indra/newview/llvoavatar.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerinfo.cpp The usual branding conflicts.
| * Fixed cmake merge error when adding SSE2 target to copy win libsMcCabe Maxsted2011-09-081-27/+26
| |
| * 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'
* | Merge remote-tracking branch 'imprudence/1.4-beta1.5' into nextDavid Walter Seikel2011-07-211-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts (merged manually): .gitignore linden/indra/newview/llgesturemgr.cpp linden/indra/newview/viewerinfo.cpp
| * Updated the windows version of openal-soft to 1.13McCabe Maxsted2011-06-241-2/+2
| |
* | Fix up gcrypt and gpg-error compiling and linking. Much cleaner now,and ↵David Walter Seikel2011-07-193-5/+5
| | | | | | | | Windows might work again.
* | Fix the linux build of OTR and friends. Hope I did not break Windows.David Walter Seikel2011-06-292-2/+2
| |
* | Build libgpg-error and libgcrypt under linux, for OTR.David Walter Seikel2011-06-282-2/+6
| | | | | | | | | | | | | | There is still a problem, the linux compile script (number 3) will bomb out at the link stage, but simply starting it again it runs fine. This was too much work, and it's way past my bed time. It works, so commiting it now, and fixing that problem later. Still could use some cleaning up to.
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-046-8/+81
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manually merged): linden/indra/llcommon/llversionviewer.h linden/indra/llvfs/lldir.cpp linden/indra/llvfs/lldir_mac.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/Info-meta-impy.plist linden/indra/newview/llappviewer.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/packaging/mac/Info.plist.in linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerversion.cpp linden/indra/newview/viewerversion.h linden/install.xml Also some post merge tweaks.
| * 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
| | |
* | | checkpoint, non functionalJay Threeth2011-04-025-0/+34
| | |
* | | checkpoint, non functionalJay Threeth2011-04-022-0/+14
| | |
* | | 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
| | |
generated by cgit v1.1 at 2025-04-01 08:25:10 +0000