From 54b2b3cf5e39b12181d2ede9cc49f5601a5ffaba Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Fri, 7 Oct 2011 16:11:29 +0200 Subject: [PATCH] Don't set GCC_VERSION This effectively reverts a previous commit which set this flag to "4.2" causing problems with compilation when gcc-4.2 was not installed. When GCC_VERSION is not set Xcode is supposed to use /usr/bin/gcc which is presumably the same gcc version that the Vim Makefile uses. --- src/MacVim/MacVim.xcodeproj/project.pbxproj | 10 ++-------- .../PSMTabBarControl.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index 816c0d690b..71e058574d 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -227,13 +227,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0395AA980D76E86200881434 /* Edit in ODBEditor */ = { - isa = PBXGroup; - children = ( - ); - name = "Edit in ODBEditor"; - sourceTree = ""; - }; 080E96DDFE201D6D7F000001 /* MacVim Source */ = { isa = PBXGroup; children = ( @@ -406,7 +399,6 @@ isa = PBXGroup; children = ( 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */, - 0395AA980D76E86200881434 /* Edit in ODBEditor */, 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */, 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, @@ -633,6 +625,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = ""; GCC_WARN_PEDANTIC = NO; HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Info.plist; @@ -663,6 +656,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = s; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; diff --git a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj index 7cd9f499c2..44be9f45f3 100644 --- a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj +++ b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj @@ -551,7 +551,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - GCC_VERSION = 4.2; + GCC_VERSION = ""; INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; ONLY_ACTIVE_ARCH = YES; @@ -573,7 +573,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - GCC_VERSION = 4.2; + GCC_VERSION = ""; INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; ONLY_ACTIVE_ARCH = YES;