livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,483 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

18 Commits (786b291d9c6b784c7ce6ceef0e38a4ec76ea14db)

Author SHA1 Message Date
Nicky 786b291d9c Move CMake files to modernized cmake syntax, step 1. 
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
 2022-04-06 16:32:52 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Monty Brandenberg 29bea5a6b9 Merge. Refresh from viewer-release after 3.7.11 release. 2014-07-08 17:29:48 -04:00
Monty Brandenberg f8874d04b8 Linux/Win: Bad checksum on Windows package. Libz and libpng linking changes to find newest code. 
Windows autobuild package had a bad checksum due to oddities in the build
system.  On Linux I've been fighting with getting libz 1.2.8 and libpng
1.6.8 to be the definitive version in the viewer.  Problem is the *massive*
library search tree we assemble.  We find older shared library versions
first and so those dominated.  By using --whole-archive with static libraries,
the packaged versions of these libraries are made definitive.
 2014-04-15 22:48:52 +00:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Monty Brandenberg 460d01befb Update build plumbing with tier 2, 3 and 4 libraries 2013-11-01 23:32:44 +00:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Andrew de Laix fcdd82af83 update libpng archive for linux. 2011-03-11 23:50:00 +00:00
Andrew A. de Laix 33927b8451 update libpng and jpeglib archives for mac. 2011-03-07 11:44:51 -08:00
Andrew A. de Laix c5aaefe37f fix some mac build problems with library name changes with new packaages. 2011-03-01 13:13:05 -08:00
squire 531de7491b Changes windows build and PNG cmake to reflect latests libpng builds 2011-02-21 18:57:54 -08:00
Boroondas Gupte 6e1ba9c960 merged STORM-130 (a.k.a. VWR-22769, SNOW-737 Version agnostic libPNG linking) 2010-09-15 16:07:13 +02:00
Merov Linden c4a99e9a6e VWR-22769 : libPNG linking: fixed the non standalone case so that we can keep things unchanged for those folks (libpng wise) while taking in changes making things easier for standalone builders 2010-09-13 11:59:57 -07:00
Boroondas Gupte 9c4a2547b9 SNOW-737 FIXED Version agnostic libPNG linking 
Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff
applied with fuzz 3:

	patching file indra/cmake/PNG.cmake
	Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.cpp
	Hunk #1 succeeded at 215 (offset -2 lines).
	Hunk #2 succeeded at 363 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.h
	Hunk #1 succeeded at 31 (offset -2 lines).

Added entry in doc/contributions.txt.
No further changes other than that.
 2010-08-29 18:32:20 +02:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
 2009-05-04 17:43:26 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
 2009-02-18 21:10:16 +00:00
Jennifer Leech fbf15572d9 svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
 2008-06-02 21:14:31 +00:00