diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-04-15 16:51:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-04-15 16:51:47 -0400 |
| commit | 0d84128983effb76c045dc38d3dd1478daecff83 (patch) | |
| tree | 567c683636fd23532b71caeb2c30436232ab9165 | |
| parent | cc587b9ef98f31696428a6a1aee11ee09b851275 (diff) | |
| parent | 247c1907bcf1c296d5fdbcaac0f7bc1f6d9b65f2 (diff) | |
Merge removal of #include <ext/stdio_filebuf.h> to tip
| -rwxr-xr-x | BuildParams | 2 | ||||
| -rwxr-xr-x | autobuild.xml | 52 |
2 files changed, 15 insertions, 39 deletions
diff --git a/BuildParams b/BuildParams index 74bd2b4923..bfcb48b6cc 100755 --- a/BuildParams +++ b/BuildParams @@ -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" diff --git a/autobuild.xml b/autobuild.xml index 52d750f64d..ea7d166bc9 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -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> |