summaryrefslogtreecommitdiff
path: root/indra/llwindow/CMakeLists.txt
AgeCommit message (Collapse)Author
2011-01-31find latest DirectX dirs.Alain Linden
2010-12-15VWR-24254: Add support for using ld.gold on linux.Aleric Inglewood
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!). VWR-24254: Don't link with fontconfig on non-linux. While we already added fontconfig in the above patch, that code turned out to also be used by Windows and Darwin (contrary to the comments in the code). After looking at the history of commits and a discussion on IRC it was decided that the original coder (Kyle Ambroff <ambroff@lindenlab.com>) really meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER).
2010-02-08Try to fix coverity build; the media drag-and-drop code introduced an ole32 ↵Tofu Linden
dep into llwindow.
2009-11-18Add support for removing the Windows specific drag/drop codecallum
from the codebase via a new CMake file (DragDrop.cmake).
2009-11-02Added CMake file for new cpp/h filecallum
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.
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵James Cook
UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-06-26Fix broken Linux server build.Kyle Ambroff
llwindow refactoring in skinning-7 r117641 added dependency on LLWindowCallbacks in llwindowheadless, which was not being built for server only builds. * Include llwindowcallbacks.cpp in all llwindow builds. * Do not link with libatk and libsdl for server linux builds, since they are not needed and only packaged for the viewer. Reviewed with James.
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-04-20Retry. Build system fixes for library-library dependencies, ported from ↵James Cook
skinning-7. OK by CG. svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-17Back out last commit, because it breaks mapserver build on linux, dammit.James Cook
2009-04-17Build system fixes for library-library dependencies, ported from skinning-7. ↵James Cook
OK by CG. svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers