5 files changed, 75 insertions, 11 deletions
diff --git a/XcodeConfig/subconfig/General.xcconfig b/XcodeConfig/subconfig/General.xcconfig
index b9f7313..b6a9a02 100644
--- a/XcodeConfig/subconfig/General.xcconfig
+++ b/XcodeConfig/subconfig/General.xcconfig
@@ -2,7 +2,7 @@
 //  General.xcconfig
 //
 //  Xcode configuration file for general build settings applicable to all
-//  Google projects and targets.
+//  projects and targets.
 //
 //  Copyright 2006-2008 Google Inc.
 //
@@ -20,7 +20,7 @@
 //
 
 // Build for PPC and Intel
-ARCHS = ppc i386
+ARCHS = i386 ppc
 
 // Zerolink prevents link warnings so turn it off
 ZERO_LINK = NO
diff --git a/XcodeConfig/subconfig/LeopardOrLater.xcconfig b/XcodeConfig/subconfig/LeopardOrLater.xcconfig
new file mode 100644
index 0000000..b2828d7
--- /dev/null
+++ b/XcodeConfig/subconfig/LeopardOrLater.xcconfig
@@ -0,0 +1,28 @@
+//
+//  LeopardOrLater.xcconfig
+//
+//  Xcode configuration file for projects targeting 10.4 Tiger or later. These
+//  settings produce a Universal binary compatible with 10.4 for PPC and Intel.
+//
+//  Copyright 2006-2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+//
+
+// Default SDK and minimum OS version is 10.5
+SDKROOT = ${DEVELOPER_SDK_DIR}/MacOSX10.5.sdk
+MACOSX_DEPLOYMENT_TARGET = 10.5
+GCC_VERSION = 4.0
+
+// On Leopard use Obj-C fast dispatch
+GCC_FAST_OBJC_DISPATCH = YES
diff --git a/XcodeConfig/subconfig/TigerOrLater.xcconfig b/XcodeConfig/subconfig/TigerOrLater.xcconfig
index d46e1a2..d8f7a3d 100644
--- a/XcodeConfig/subconfig/TigerOrLater.xcconfig
+++ b/XcodeConfig/subconfig/TigerOrLater.xcconfig
@@ -1,9 +1,8 @@
 //
 //  TigerOrLater.xcconfig
 //
-//  Xcode configuration file for Google applications targeting 10.4 Tiger or
-//  later. These settings produce a Universal binary compatible with 10.4 for
-//  PPC and Intel.
+//  Xcode configuration file for projects targeting 10.4 Tiger or later. These
+//  settings produce a Universal binary compatible with 10.4 for PPC and Intel.
 //
 //  Copyright 2006-2008 Google Inc.
 //
diff --git a/XcodeConfig/subconfig/Unittest.xcconfig b/XcodeConfig/subconfig/Unittest.xcconfig
index a35dc61..96121ee 100644
--- a/XcodeConfig/subconfig/Unittest.xcconfig
+++ b/XcodeConfig/subconfig/Unittest.xcconfig
@@ -1,11 +1,8 @@
 //
 //  Unittest.xcconfig
 //
-//  Xcode configuration file for a unittest target.
-//
-//  This is a _Target_ config file, for use in the "Based on" popup of the
-//  settings dialog for a target. Do not attempt to apply this as the base
-//  of an Xcode configuration in the project settings dialog.
+//  Xcode configuration file for a basic unittest targets.  Use the debug or
+//  release build specific configs in the Target folder.
 //
 //  Copyright 2006-2008 Google Inc.
 //
@@ -23,7 +20,7 @@
 //
 
 // Unittests are loadable bundles
-#include "../LoadableBundle.xcconfig"
+#include "../Target/LoadableBundle.xcconfig"
 
 // Force C99 dialect with GNU extensions (needed for OCUnit)
 GCC_C_LANGUAGE_STANDARD = gnu99
@@ -31,3 +28,6 @@ GCC_C_LANGUAGE_STANDARD = gnu99
 // Deploment postprocessing is what triggers Xcode to strip, we don't strip
 // unittests
 DEPLOYMENT_POSTPROCESSING = NO
+
+// Most common unittests will be objective-c
+WRAPPER_EXTENSION = octest
diff --git a/XcodeConfig/subconfig/iPhone.xcconfig b/XcodeConfig/subconfig/iPhone.xcconfig
new file mode 100644
index 0000000..42445f1
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone.xcconfig
@@ -0,0 +1,37 @@
+//
+//  iPhone.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone
+//
+//  Copyright 2006-2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+// Build for ARM
+ARCHS = armv6
+
+// Build only the active architecture
+ONLY_ACTIVE_ARCH = YES
+
+// Code signing. Should be overridden if releasing
+CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
+
+// Default SDK and minimum OS version is the iphone SDK.
+SDKROOT = iphoneos2.0
+
+MACOSX_DEPLOYMENT_TARGET = 10.5
+GCC_VERSION = 4.0
+
+// On iPhone use Obj-C fast dispatch
+GCC_FAST_OBJC_DISPATCH = YES
+