diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 12:24:16 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 12:24:16 -0500 |
| commit | 20edd5f5f06814f36c56e5fbaa4b4a6cd3fe5a42 (patch) | |
| tree | 67ece3369c0ddf5053e3ca8ff43bac2568472d7c /autobuild.xml | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
| parent | 3a5f35e2777a7ab0bc139e94342d895b8bb346ed (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'autobuild.xml')
| -rwxr-xr-x | autobuild.xml | 52 |
1 files changed, 14 insertions, 38 deletions
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> |