aboutsummaryrefslogtreecommitdiff
path: root/XcodeConfig/Project
diff options
context:
space:
mode:
authorGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2011-08-23 20:30:21 +0000
committerGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2011-08-23 20:30:21 +0000
commit5254e4910abd5fbb5d915ff033edd9212bf0d7fd (patch)
tree39e36f09e088b963a29dd6b512bff35baa40fe31 /XcodeConfig/Project
parentc6301cab8e7185b9793940ee84ae2b6af3da1b8d (diff)
[Author: thomasvl]
This will need followup, but this is a quick and dirty to fix the things that have gone very stale. - Stop setting mac min sdk for iOS, there is an iOS version now (and setting it can cause linker errors on newer xcodes). - Add iOS xcconfigs that use the current SDK and have projects set their min version as that's how Apple wants things. - Add new config that uses the current SDK to make development workable. - Block codesigning on the iOS unittests for now. - Block format string warnings on logger until we can sort out a way to shut it up for gcc 4.2 or actually make it work. R=dmaclach DELTA=289 (277 added, 3 deleted, 9 changed)
Diffstat (limited to 'XcodeConfig/Project')
-rw-r--r--XcodeConfig/Project/DebugiOS.xcconfig37
-rw-r--r--XcodeConfig/Project/ReleaseiOS.xcconfig37
2 files changed, 74 insertions, 0 deletions
diff --git a/XcodeConfig/Project/DebugiOS.xcconfig b/XcodeConfig/Project/DebugiOS.xcconfig
new file mode 100644
index 0000000..e4998d3
--- /dev/null
+++ b/XcodeConfig/Project/DebugiOS.xcconfig
@@ -0,0 +1,37 @@
+//
+// DebugiOS.xcconfig
+//
+// Xcode configuration file for building a Debug configuration of a project
+// for iOS.
+//
+// Copyright 2011 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.
+
+//
+// This is a _Configuration_ Xcode config file for use in the "Based on" popup
+// of the project configuration editor. Do _not_ use this as the config base
+// and individual Xcode target, there are other configuration files for that
+// purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iOS settings.
+#include "../subconfig/iOS.xcconfig"
+
+// Debug settings
+#include "../subconfig/Debug.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiOS.xcconfig b/XcodeConfig/Project/ReleaseiOS.xcconfig
new file mode 100644
index 0000000..a6686fc
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiOS.xcconfig
@@ -0,0 +1,37 @@
+//
+// ReleaseiOS.xcconfig
+//
+// Xcode configuration file for building a Release configuration of a project
+// for iOS.
+//
+// Copyright 2011 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.
+
+//
+// This is a _Configuration_ Xcode config file for use in the "Based on" popup
+// of the project configuration editor. Do _not_ use this as the config base
+// and individual Xcode target, there are other configuration files for that
+// purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iOS settings.
+#include "../subconfig/iOS.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"