livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai

meow-7.2.2
Nyx (Neal Orman) 2012-01-19 12:05:48 -05:00
parent 496fa2ea87 3b6606eed8
commit 650e6e8afb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.xml
View File

@ -1254,9 +1254,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a682c345382dfc19d0e718b073e7c5b9</string>
<string>76cac9c6be702db7402623a405f7e59c</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247841/arch/Linux/installer/llpathinglibrary-0.1-linux-20120117.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248048/arch/Linux/installer/llpathinglibrary-0.1-linux-20120119.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>

5
indra/cmake/LLPathingLib.cmake
View File

@ -16,3 +16,8 @@ set(LLPATHING_LIBRARIES
debug ${LL_PATHING_DEBUG_LIB}
optimized ${LL_PATHING_RELEASE_LIB}
)
if (LINUX)
list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group)
list(APPEND LLPATHING_LIBRARIES -Wl,--end-group)
endif (LINUX)