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

Merge ll[io]fstreamlining to tip.

master
Nat Goodspeed 2015-04-15 13:27:33 -04:00
parent e9be710daf 75396e1f13
commit 247c1907bc
2 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildParams
View File

@ -4,7 +4,7 @@
# https://wiki.secondlife.com/wiki/Automated_Build_System
# Global setting for now...
# Global setting for now....
Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"

52
autobuild.xml
View File

@ -2388,11 +2388,12 @@
<map>
<key>RelWithDebInfo</key>
<map>
<key>build</key>
<map>
</map>
<key>configure</key>
<map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>command</key>
<string>cmake</string>
<key>options</key>
@ -2429,11 +2430,12 @@
</map>
<key>Release</key>
<map>
<key>build</key>
<map>
</map>
<key>configure</key>
<map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>command</key>
<string>cmake</string>
<key>options</key>
@ -2496,10 +2498,6 @@
</map>
<key>configure</key>
<map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>options</key>
<array>
<string>-G</string>
@ -2554,10 +2552,6 @@
</map>
<key>configure</key>
<map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>options</key>
<array>
<string>-G</string>
@ -2615,10 +2609,6 @@
</map>
<key>configure</key>
<map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>options</key>
<array>
<string>-G</string>
@ -2665,10 +2655,6 @@
</map>
<key>configure</key>
<map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>options</key>
<array>
<string>-G</string>
@ -2768,16 +2754,11 @@
<string>SecondLife.sln</string>
</array>
<key>command</key>
<string>msbuild.exe</string>
<string>devenv</string>
<key>options</key>
<array>
<string>/p:Configuration=RelWithDebInfo</string>
<string>/p:Platform=Win32</string>
<string>/t:Build</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
<string>/toolsversion:4.0</string>
<string>/p:"VCBuildAdditionalOptions= /incremental"</string>
<string>/build</string>
<string>"RelWithDebInfo|Win32"</string>
</array>
</map>
<key>configure</key>
@ -2854,16 +2835,11 @@
<string>SecondLife.sln</string>
</array>
<key>command</key>
<string>msbuild.exe</string>
<string>devenv</string>
<key>options</key>
<array>
<string>/p:Configuration=Release</string>
<string>/p:Platform=Win32</string>
<string>/t:Build</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
<string>/toolsversion:4.0</string>
<string>/p:"VCBuildAdditionalOptions= /incremental"</string>
<string>/build</string>
<string>"Release|Win32"</string>
</array>
</map>
<key>configure</key>