From 5ad976b2043b946a55b1909d94616f123c05a9fe Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Sun, 3 Feb 2008 16:13:06 +0100 Subject: [PATCH] Update Xcode project file - add 'Universal' configuration (builds a universal binary) - use 'apple-generic' versioning (agvtool) --- src/MacVim/MacVim.xcodeproj/project.pbxproj | 68 ++++++++++++++++------ .../PSMTabBarControl.xcodeproj/project.pbxproj | 56 ++++++++++++++++++ .../PSMTabBarControl.xcodeproj/winckler.mode1 | 6 +- .../PSMTabBarControl.xcodeproj/winckler.pbxuser | 4 +- 4 files changed, 112 insertions(+), 22 deletions(-) diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index 8222cd6d..f3c71259 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -37,7 +37,6 @@ 1D80FBD40CBBD3B700102A1C /* MMFullscreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD00CBBD3B700102A1C /* MMFullscreenWindow.m */; }; 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD20CBBD3B700102A1C /* MMVimView.m */; }; 1D80FBE40CBBD6F200102A1C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D80FBE30CBBD6F200102A1C /* Carbon.framework */; }; - 1D9918480D299F9900A96335 /* MMAtsuiTextView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1D9918460D299F9900A96335 /* MMAtsuiTextView.h */; }; 1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */; }; 1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */; }; 1DD0C20C0C60FFB4008CD84A /* gvimrc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD0C20A0C60FF9A008CD84A /* gvimrc */; }; @@ -46,11 +45,9 @@ 1DD704310BA9F9C2008679E9 /* SpecialKeys.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD704300BA9F9C2008679E9 /* SpecialKeys.plist */; }; 1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */; }; 1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E50D50F80500052B9E /* Preferences.nib */; }; - 1DE3F8EA0D50F84600052B9E /* MMPreferenceController.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */; }; 1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */; }; 1DE608B40C587FDA0055263D /* runtime in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DE602470C587FD10055263D /* runtime */; }; 1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */; }; - 1DE9B94F0D341AB8008FEDD4 /* MMWindow.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */; }; 1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */; }; 1DED78600C6DE43D0079945F /* vimrc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DED785F0C6DE43D0079945F /* vimrc */; }; 1DEE0D9F0C4E150B008E82B2 /* Attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DEE0D8A0C4E150B008E82B2 /* Attention.png */; }; @@ -99,16 +96,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 031AD5ED0D4DE2360026C5D7 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 031AD5EE0D4DE2490026C5D7 /* Sparkle.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1D0DCAD80BA3604D00B6CCFA /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -116,9 +103,6 @@ dstSubfolderSpec = 6; files = ( 1D493D580C5247BF00AB718C /* Vim in CopyFiles */, - 1D9918480D299F9900A96335 /* MMAtsuiTextView.h in CopyFiles */, - 1DE9B94F0D341AB8008FEDD4 /* MMWindow.h in CopyFiles */, - 1DE3F8EA0D50F84600052B9E /* MMPreferenceController.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -128,6 +112,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 031AD5EE0D4DE2490026C5D7 /* Sparkle.framework in CopyFiles */, 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -444,7 +429,6 @@ 1D0DCAD80BA3604D00B6CCFA /* CopyFiles */, 1D9EB2840C366D7B0074B739 /* CopyFiles */, 1DE608B80C58807F0055263D /* CopyFiles */, - 031AD5ED0D4DE2360026C5D7 /* CopyFiles */, ); buildRules = ( ); @@ -605,11 +589,56 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 1D13D1610D560D9D0084F3AB /* Universal */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + ppc, + i386, + ); + COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 20; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\""; + FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; + GCC_DYNAMIC_NO_PIC = YES; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = s; + HEADER_SEARCH_PATHS = PSMTabBarControl/source/; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Applications"; + PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Universal; + }; + 1D13D1620D560D9D0084F3AB /* Universal */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + PREBINDING = NO; + SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + }; + name = Universal; + }; C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 20; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", @@ -629,6 +658,7 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -639,6 +669,7 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 20; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", @@ -658,6 +689,7 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -691,6 +723,7 @@ buildConfigurations = ( C01FCF4B08A954540054247B /* Debug */, C01FCF4C08A954540054247B /* Release */, + 1D13D1610D560D9D0084F3AB /* Universal */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -700,6 +733,7 @@ buildConfigurations = ( C01FCF4F08A954540054247B /* Debug */, C01FCF5008A954540054247B /* Release */, + 1D13D1620D560D9D0084F3AB /* Universal */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj index 15efd203..2b8b1d50 100644 --- a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj +++ b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj @@ -531,6 +531,59 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 1D13D16D0D560DDA0084F3AB /* Universal */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + ppc, + i386, + ); + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist"; + INSTALL_PATH = "@executable_path/../Frameworks"; + OTHER_LDFLAGS = ( + "-seg1addr", + 0xc0000000, + ); + PRODUCT_NAME = PSMTabBarControl; + SYMROOT = ../build; + }; + name = Universal; + }; + 1D13D16E0D560DDA0084F3AB /* Universal */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + ppc, + i386, + ); + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + PRODUCT_NAME = All; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + name = Universal; + }; + 1D13D16F0D560DDA0084F3AB /* Universal */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + PREBINDING = NO; + SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + }; + name = Universal; + }; C056398008A954F8003078D8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -643,6 +696,7 @@ buildConfigurations = ( C056398008A954F8003078D8 /* Debug */, C056398108A954F8003078D8 /* Release */, + 1D13D16D0D560DDA0084F3AB /* Universal */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -652,6 +706,7 @@ buildConfigurations = ( C056398808A954F8003078D8 /* Debug */, C056398908A954F8003078D8 /* Release */, + 1D13D16E0D560DDA0084F3AB /* Universal */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -661,6 +716,7 @@ buildConfigurations = ( C056398C08A954F8003078D8 /* Debug */, C056398D08A954F8003078D8 /* Release */, + 1D13D16F0D560DDA0084F3AB /* Universal */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1 b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1 index 524ae0f8..3929945b 100644 --- a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1 +++ b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.mode1 @@ -367,9 +367,9 @@ TableOfContents - 1DC70EA20C57D2650079D3C6 + 1D13D16B0D560DDA0084F3AB 1CE0B1FE06471DED0097A5F4 - 1DC70EA30C57D2650079D3C6 + 1D13D16C0D560DDA0084F3AB 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -503,7 +503,7 @@ 5 WindowOrderList - /Users/winckler/Projects/vim7/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj + /Users/winckler/macvim/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj WindowString 160 82 690 397 0 0 1024 746 diff --git a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser index 1acc8488..71358227 100644 --- a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser +++ b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser @@ -49,8 +49,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 207082065; - PBXWorkspaceStateSaveDate = 207082065; + PBXPerProjectTemplateStateSaveDate = 223743414; + PBXWorkspaceStateSaveDate = 223743414; }; sourceControlManager = 1D82C6100AC093AF00AAD418 /* Source Control */; userBuildSettings = { -- 2.11.4.GIT