diff --git a/autobuild.xml b/autobuild.xml
index 45dba8381d0fcf31cee867c395cfdd6eed8c9155..70803961a16a27c025efd50145e3878837778703 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1440,15 +1440,6 @@
             <map>
               <key>build</key>
               <map>
-                <key>command</key>
-                <string>cmake</string>
-                <key>options</key>
-                <array>
-                  <string>--build</string>
-                  <string>.</string>
-                  <string>--config</string>
-                  <string>Debug</string>
-                </array>
               </map>
               <key>configure</key>
               <map>
@@ -1472,15 +1463,6 @@
             <map>
               <key>build</key>
               <map>
-                <key>command</key>
-                <string>cmake</string>
-                <key>options</key>
-                <array>
-                  <string>--build</string>
-                  <string>.</string>
-                  <string>--config</string>
-                  <string>RelWithDebInfo</string>
-                </array>
               </map>
               <key>configure</key>
               <map>
@@ -1504,15 +1486,6 @@
             <map>
               <key>build</key>
               <map>
-                <key>command</key>
-                <string>cmake</string>
-                <key>options</key>
-                <array>
-                  <string>--build</string>
-                  <string>.</string>
-                  <string>--config</string>
-                  <string>Release</string>
-                </array>
               </map>
               <key>configure</key>
               <map>
@@ -1544,6 +1517,16 @@
           <map>
             <key>Debug</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration Debug</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>arguments</key>
@@ -1563,6 +1546,13 @@
             <map>
               <key>build</key>
               <map>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration RelWithDebInfo</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
               </map>
               <key>configure</key>
               <map>
@@ -1583,6 +1573,16 @@
             </map>
             <key>Release</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration Release</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>arguments</key>
@@ -1610,6 +1610,15 @@
           <map>
             <key>Debug</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 12</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>arguments</key>
@@ -1629,6 +1638,12 @@
             <map>
               <key>build</key>
               <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 12</string>
+                </array>
               </map>
               <key>configure</key>
               <map>
@@ -1649,6 +1664,15 @@
             </map>
             <key>Release</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 12</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>arguments</key>
@@ -1676,6 +1700,20 @@
           <map>
             <key>Debug</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>BuildConsole</string>
+                <key>options</key>
+                <array>
+                  <string>/build</string>
+                  <string>"/cfg=Debug|Win32"</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>arguments</key>
@@ -1695,6 +1733,17 @@
             <map>
               <key>build</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>BuildConsole</string>
+                <key>options</key>
+                <array>
+                  <string>/build</string>
+                  <string>"/cfg=RelWithDebInfo|Win32"</string>
+                </array>
               </map>
               <key>configure</key>
               <map>
@@ -1715,6 +1764,20 @@
             </map>
             <key>Release</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>BuildConsole</string>
+                <key>options</key>
+                <array>
+                  <string>/build</string>
+                  <string>"/cfg=Release|Win32"</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>arguments</key>