forked from pieter/gitx
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Simplify Xcode's build settings on project and target level by using …
…xcconfigs. Since xcconfigs can include other configs you get the same functionality that Xcode's build settings give you but with much more clarity. And it's much better for SCM, especially decentralized ones like git. Changes: - Archs is set to ppc i386 x86_64 - libgit2 is now compiled including -arch x86_64. - LTO is off (caused a Rel32 address space error when linking) - Default compiler is now LLVM GCC4.2 since Clang is not quite ready for Objective C++. (and we have some .mm files in there) - Based on: settings on Xcode's build settings dialogs are set according to the name of the xcconfig file. (project settings are based on Common.xcconfig) - Deleted all the overwritten settings (bold font display) that are now defined through the xcconfigs.
- Loading branch information
Showing
5 changed files
with
143 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // | ||
| // Common.xcconfig | ||
| // GitX | ||
| // | ||
| // Created by Andre Berg on 25.03.10. | ||
| // Copyright 2010 Berg Media. All rights reserved. | ||
| // | ||
| // 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. | ||
|
|
||
| // Archs and Target SDKs | ||
|
|
||
| ARCHS = ppc i386 x86_64 | ||
| SDKROOT = macosx10.5 | ||
| MACOSX_DEPLOYMENT_TARGET = 10.5 | ||
|
|
||
| // Search Paths | ||
|
|
||
| HEADER_SEARCH_PATHS = libgit2/src | ||
| LIBRARY_SEARCH_PATHS = libgit2 | ||
| FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SRCROOT)" | ||
|
|
||
| // Info.plist | ||
|
|
||
| INFOPLIST_PREPROCESS = YES | ||
| INFOPLIST_OTHER_PREPROCESSOR_FLAGS = -traditional | ||
| INFOPLIST_FILE = Info.plist | ||
| INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision // needed for the `git describe --long` output in the about dialog | ||
|
|
||
| // Compiler | ||
|
|
||
| GCC_ENABLE_OBJC_GC = required | ||
| // GCC_VERSION = // System Default (GCC 4.2) | ||
| GCC_VERSION = com.apple.compilers.llvmgcc42 // LLVM GCC 4.2 | ||
| // GCC_VERSION = com.apple.compilers.llvm.clang.1_0 // Clang LLVM 1.0 | ||
| GCC_C_LANGUAGE_STANDARD = gnu99 | ||
|
|
||
| // Prefix Header | ||
|
|
||
| GCC_PRECOMPILE_PREFIX_HEADER = YES | ||
| GCC_PREFIX_HEADER = GitX_Prefix.pch | ||
|
|
||
| // Linking | ||
|
|
||
| PREBINDING = NO | ||
| ZERO_LINK = NO // this is no longer needed | ||
|
|
||
| // Other | ||
|
|
||
| LLVM_LTO = NO // Link-Time Optimization causes a Rel32 address space error when linking (since we now target x86_64 inclusively) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // | ||
| // Debug.xcconfig | ||
| // GitX | ||
| // | ||
| // Created by Andre Berg on 25.03.10. | ||
| // Copyright 2010 Berg Media. All rights reserved. | ||
| // | ||
| // 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. | ||
|
|
||
| #include "Common.xcconfig" | ||
|
|
||
| // Macros | ||
|
|
||
| GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = DEBUG_BUILD | ||
|
|
||
| OTHER_CFLAGS = -fdiagnostics-show-option | ||
|
|
||
| // Warnings | ||
|
|
||
| GCC_WARN_UNUSED_VARIABLE = YES | ||
| GCC_WARN_CHECK_SWITCH_STATEMENTS = YES | ||
| GCC_WARN_ABOUT_RETURN_TYPE = YES | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // | ||
| // Release.xcconfig | ||
| // GitX | ||
| // | ||
| // Created by Andre Berg on 25.03.10. | ||
| // Copyright 2010 Berg Media. All rights reserved. | ||
| // | ||
| // 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. | ||
|
|
||
| #include "Common.xcconfig" | ||
|
|
||
| DEBUG_INFORMATION_FORMAT = dwarf-with-dsym |