From 335387a9a650c5f6275d22a6a85c913cf8188d03 Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Wed, 16 Nov 2011 16:30:13 +0000 Subject: [Author: thomasvl] Move the MacOSX configs as also going in the direction of settings the SDK in the project and getting it out of the configs. TBR=dmaclach --- XcodeConfig/Project/DebugLeopardOrLater.xcconfig | 8 +++-- XcodeConfig/Project/DebugMacOSX.xcconfig | 37 ++++++++++++++++++++++ .../Project/DebugSnowLeopardOrLater.xcconfig | 8 +++-- XcodeConfig/Project/DebugTigerOrLater.xcconfig | 8 +++-- XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig | 8 +++-- XcodeConfig/Project/ReleaseMacOSX.xcconfig | 37 ++++++++++++++++++++++ .../Project/ReleaseSnowLeopardOrLater.xcconfig | 8 +++-- XcodeConfig/Project/ReleaseTigerOrLater.xcconfig | 8 +++-- XcodeConfig/subconfig/MacOSX.xcconfig | 24 ++++++++++++++ XcodeConfig/subconfig/iOS.xcconfig | 2 +- 10 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 XcodeConfig/Project/DebugMacOSX.xcconfig create mode 100644 XcodeConfig/Project/ReleaseMacOSX.xcconfig create mode 100644 XcodeConfig/subconfig/MacOSX.xcconfig (limited to 'XcodeConfig') diff --git a/XcodeConfig/Project/DebugLeopardOrLater.xcconfig b/XcodeConfig/Project/DebugLeopardOrLater.xcconfig index b00a6cc..29bb396 100644 --- a/XcodeConfig/Project/DebugLeopardOrLater.xcconfig +++ b/XcodeConfig/Project/DebugLeopardOrLater.xcconfig @@ -14,9 +14,9 @@ // 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 @@ -24,6 +24,10 @@ // the License. // +// This file will be going away, please migrate off it. Instead Apple wants +// you to use the "current" SDK, use DebugMacOSX.xcconfig and set your min +// supported OS version in your project file. + // Pull in the general settings #include "../subconfig/General.xcconfig" diff --git a/XcodeConfig/Project/DebugMacOSX.xcconfig b/XcodeConfig/Project/DebugMacOSX.xcconfig new file mode 100644 index 0000000..bcd504e --- /dev/null +++ b/XcodeConfig/Project/DebugMacOSX.xcconfig @@ -0,0 +1,37 @@ +// +// DebugSnowLeopardOrLater.xcconfig +// +// Xcode configuration file for building a Release configuration of a project +// on Mac OS X. +// +// 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. +// +// 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. +// + +// Pull in the general settings +#include "../subconfig/General.xcconfig" + +// MacOSX settings +#include "../subconfig/MacOSX.xcconfig" + +// Debug settings +#include "../subconfig/Debug.xcconfig" + +// Merge settings +#include "../subconfig/GTMMerge.xcconfig" diff --git a/XcodeConfig/Project/DebugSnowLeopardOrLater.xcconfig b/XcodeConfig/Project/DebugSnowLeopardOrLater.xcconfig index a090412..8fe6d27 100644 --- a/XcodeConfig/Project/DebugSnowLeopardOrLater.xcconfig +++ b/XcodeConfig/Project/DebugSnowLeopardOrLater.xcconfig @@ -14,9 +14,9 @@ // 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 @@ -24,6 +24,10 @@ // the License. // +// This file will be going away, please migrate off it. Instead Apple wants +// you to use the "current" SDK, use DebugMacOSX.xcconfig and set your min +// supported OS version in your project file. + // Pull in the general settings #include "../subconfig/General.xcconfig" diff --git a/XcodeConfig/Project/DebugTigerOrLater.xcconfig b/XcodeConfig/Project/DebugTigerOrLater.xcconfig index 34b7b1c..2e4f4d7 100644 --- a/XcodeConfig/Project/DebugTigerOrLater.xcconfig +++ b/XcodeConfig/Project/DebugTigerOrLater.xcconfig @@ -14,9 +14,9 @@ // 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 @@ -24,6 +24,10 @@ // the License. // +// This file will be going away, please migrate off it. Instead Apple wants +// you to use the "current" SDK, use DebugMacOSX.xcconfig and set your min +// supported OS version in your project file. + // Pull in the general settings #include "../subconfig/General.xcconfig" diff --git a/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig b/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig index 31ac835..1a62917 100644 --- a/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig +++ b/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig @@ -14,9 +14,9 @@ // 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 @@ -24,6 +24,10 @@ // the License. // +// This file will be going away, please migrate off it. Instead Apple wants +// you to use the "current" SDK, use ReleaseMacOSX.xcconfig and set your min +// supported OS version in your project file. + // Pull in the general settings #include "../subconfig/General.xcconfig" diff --git a/XcodeConfig/Project/ReleaseMacOSX.xcconfig b/XcodeConfig/Project/ReleaseMacOSX.xcconfig new file mode 100644 index 0000000..060e369 --- /dev/null +++ b/XcodeConfig/Project/ReleaseMacOSX.xcconfig @@ -0,0 +1,37 @@ +// +// ReleaseMacOSX.xcconfig +// +// Xcode configuration file for building a Release configuration of a project +// on Mac OS X. +// +// 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. +// +// 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. +// + +// Pull in the general settings +#include "../subconfig/General.xcconfig" + +// MacOSX settings +#include "../subconfig/MacOSX.xcconfig" + +// Release settings +#include "../subconfig/Release.xcconfig" + +// Merge settings +#include "../subconfig/GTMMerge.xcconfig" diff --git a/XcodeConfig/Project/ReleaseSnowLeopardOrLater.xcconfig b/XcodeConfig/Project/ReleaseSnowLeopardOrLater.xcconfig index 0d24069..f43931f 100644 --- a/XcodeConfig/Project/ReleaseSnowLeopardOrLater.xcconfig +++ b/XcodeConfig/Project/ReleaseSnowLeopardOrLater.xcconfig @@ -14,9 +14,9 @@ // 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 @@ -24,6 +24,10 @@ // the License. // +// This file will be going away, please migrate off it. Instead Apple wants +// you to use the "current" SDK, use ReleaseMacOSX.xcconfig and set your min +// supported OS version in your project file. + // Pull in the general settings #include "../subconfig/General.xcconfig" diff --git a/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig b/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig index 9301912..64e1023 100644 --- a/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig +++ b/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig @@ -14,9 +14,9 @@ // 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 @@ -24,6 +24,10 @@ // the License. // +// This file will be going away, please migrate off it. Instead Apple wants +// you to use the "current" SDK, use ReleaseMacOSX.xcconfig and set your min +// supported OS version in your project file. + // Pull in the general settings #include "../subconfig/General.xcconfig" diff --git a/XcodeConfig/subconfig/MacOSX.xcconfig b/XcodeConfig/subconfig/MacOSX.xcconfig new file mode 100644 index 0000000..6d130a4 --- /dev/null +++ b/XcodeConfig/subconfig/MacOSX.xcconfig @@ -0,0 +1,24 @@ +// +// MacOSX.xcconfig +// +// Xcode configuration file for building on Mac OS X. +// +// 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. +// + +// Set default SDK. +SDKROOT = macosx + +// Use MACOSX_DEPLOYMENT_TARGET to set the min OS version you will require. diff --git a/XcodeConfig/subconfig/iOS.xcconfig b/XcodeConfig/subconfig/iOS.xcconfig index 2b8de4f..cd86636 100644 --- a/XcodeConfig/subconfig/iOS.xcconfig +++ b/XcodeConfig/subconfig/iOS.xcconfig @@ -1,7 +1,7 @@ // // iOS.xcconfig // -// Xcode configuration file for building a Debug target on iOS. +// Xcode configuration file for building on iOS. // // Copyright 2011 Google Inc. // -- cgit v1.2.3