diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist index e39cb23a96..cdd577096a 100644 --- a/src/MacVim/Info.plist +++ b/src/MacVim/Info.plist @@ -1231,7 +1231,7 @@ CFBundleIconFile MacVim CFBundleIdentifier - org.vim.MacVim + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index c384bf7eb5..2d33cd1ec7 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -21,8 +21,8 @@ 1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D22374A0E45DF4800E6FFFF /* Advanced.png */; }; 1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D384A0D100D671700D3C22F /* KeyBinding.plist */; }; 1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */; }; - 1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; }; - 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; + 1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */; }; 1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80591D0E1185EA001699D1 /* Miscellaneous.m */; }; 1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */; }; @@ -437,8 +437,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0710; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -612,7 +615,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 78; FRAMEWORK_SEARCH_PATHS = ( @@ -632,6 +635,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = ""; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; WARNING_CFLAGS = "-Wall"; @@ -643,7 +647,7 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 78; FRAMEWORK_SEARCH_PATHS = ( @@ -662,6 +666,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = ""; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; @@ -672,7 +677,7 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + ENABLE_TESTABILITY = YES; GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -685,7 +690,6 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj b/src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..c384bf7eb5 --- /dev/null +++ b/src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj @@ -0,0 +1,722 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXBuildFile section */ + 0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */; }; + 0395A8AA0D72D88B00881434 /* General.png in Resources */ = {isa = PBXBuildFile; fileRef = 0395A8A90D72D88B00881434 /* General.png */; }; + 1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D09AB400C6A4D520045497E /* MMTypesetter.m */; }; + 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D0E051B0BA5F83800B6049E /* Colors.plist */; }; + 1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */; }; + 1D1474980C56703C0038FA2B /* MacVim.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474960C56703C0038FA2B /* MacVim.m */; }; + 1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D14749E0C5673AE0038FA2B /* MMAppController.m */; }; + 1D1474AA0C5677450038FA2B /* MMTextStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474A80C5677450038FA2B /* MMTextStorage.m */; }; + 1D1474B00C5678370038FA2B /* MMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474AE0C5678370038FA2B /* MMTextView.m */; }; + 1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474B40C56796D0038FA2B /* MMVimController.m */; }; + 1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474BA0C567A910038FA2B /* MMWindowController.m */; }; + 1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D22374A0E45DF4800E6FFFF /* Advanced.png */; }; + 1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D384A0D100D671700D3C22F /* KeyBinding.plist */; }; + 1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */; }; + 1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; }; + 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; + 1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */; }; + 1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80591D0E1185EA001699D1 /* Miscellaneous.m */; }; + 1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */; }; + 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD20CBBD3B700102A1C /* MMVimView.m */; }; + 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */; }; + 1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1D8BEA73104992290069B072 /* FindAndReplace.nib */; }; + 1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */; }; + 1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */; }; + 1DCD00BF0E50B2B700460166 /* Attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AA0E50B2B700460166 /* Attention.png */; }; + 1DCD00C00E50B2B700460166 /* Copy.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AB0E50B2B700460166 /* Copy.png */; }; + 1DCD00C10E50B2B700460166 /* Cut.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AC0E50B2B700460166 /* Cut.png */; }; + 1DCD00C20E50B2B700460166 /* FindHelp.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AD0E50B2B700460166 /* FindHelp.png */; }; + 1DCD00C30E50B2B700460166 /* FindNext.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AE0E50B2B700460166 /* FindNext.png */; }; + 1DCD00C40E50B2B700460166 /* FindPrev.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AF0E50B2B700460166 /* FindPrev.png */; }; + 1DCD00C50E50B2B700460166 /* Help.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B00E50B2B700460166 /* Help.png */; }; + 1DCD00C60E50B2B700460166 /* LoadSesn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B10E50B2B700460166 /* LoadSesn.png */; }; + 1DCD00C70E50B2B700460166 /* Make.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B20E50B2B700460166 /* Make.png */; }; + 1DCD00C80E50B2B700460166 /* Open.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B30E50B2B700460166 /* Open.png */; }; + 1DCD00C90E50B2B700460166 /* Paste.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B40E50B2B700460166 /* Paste.png */; }; + 1DCD00CA0E50B2B700460166 /* Print.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B50E50B2B700460166 /* Print.png */; }; + 1DCD00CB0E50B2B700460166 /* Redo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B60E50B2B700460166 /* Redo.png */; }; + 1DCD00CC0E50B2B700460166 /* Replace.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B70E50B2B700460166 /* Replace.png */; }; + 1DCD00CD0E50B2B700460166 /* RunCtags.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B80E50B2B700460166 /* RunCtags.png */; }; + 1DCD00CE0E50B2B700460166 /* RunScript.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B90E50B2B700460166 /* RunScript.png */; }; + 1DCD00CF0E50B2B700460166 /* Save.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BA0E50B2B700460166 /* Save.png */; }; + 1DCD00D00E50B2B700460166 /* SaveAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BB0E50B2B700460166 /* SaveAll.png */; }; + 1DCD00D10E50B2B700460166 /* SaveSesn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BC0E50B2B700460166 /* SaveSesn.png */; }; + 1DCD00D20E50B2B700460166 /* TagJump.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BD0E50B2B700460166 /* TagJump.png */; }; + 1DCD00D30E50B2B700460166 /* Undo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BE0E50B2B700460166 /* Undo.png */; }; + 1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */; }; + 1DD0C20C0C60FFB4008CD84A /* gvimrc in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DD0C20A0C60FF9A008CD84A /* gvimrc */; }; + 1DD3D51E0D82D4C9006E4320 /* ibeam.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD3D51D0D82D4C9006E4320 /* ibeam.png */; }; + 1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */; }; + 1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */; }; + 1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E50D50F80500052B9E /* Preferences.nib */; }; + 1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */; }; + 1DE608B40C587FDA0055263D /* runtime in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DE602470C587FD10055263D /* runtime */; }; + 1DE63FFB0E71820F00959BDB /* MMCoreTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */; }; + 1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */; }; + 1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */; }; + 1DED78600C6DE43D0079945F /* vimrc in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DED785F0C6DE43D0079945F /* vimrc */; }; + 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; + 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; + 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; + 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; + 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 1D493DB80C52533B00AB718C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 53DF68FD067E5B5A0090B5B0; + remoteInfo = PSMTabBarControlFramework; + }; + 1D493DCC0C5254A400AB718C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0; + remoteInfo = PSMTabBarControlFramework; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 1D0DCAD80BA3604D00B6CCFA /* Copy Executables */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 6; + files = ( + 1D493D580C5247BF00AB718C /* Vim in Copy Executables */, + ); + name = "Copy Executables"; + runOnlyForDeploymentPostprocessing = 0; + }; + 1D9EB2840C366D7B0074B739 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + 1DE608B80C58807F0055263D /* Copy Vim Runtime Files */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = vim; + dstSubfolderSpec = 7; + files = ( + 1DED78600C6DE43D0079945F /* vimrc in Copy Vim Runtime Files */, + 1DD0C20C0C60FFB4008CD84A /* gvimrc in Copy Vim Runtime Files */, + 1DE608B40C587FDA0055263D /* runtime in Copy Vim Runtime Files */, + ); + name = "Copy Vim Runtime Files"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 0395A8310D71ED7800881434 /* DBPrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBPrefsWindowController.h; sourceTree = ""; }; + 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPrefsWindowController.m; sourceTree = ""; }; + 0395A8A90D72D88B00881434 /* General.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = General.png; sourceTree = ""; }; + 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 1D09AB3F0C6A4D520045497E /* MMTypesetter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTypesetter.h; sourceTree = ""; }; + 1D09AB400C6A4D520045497E /* MMTypesetter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTypesetter.m; sourceTree = ""; }; + 1D0E051B0BA5F83800B6049E /* Colors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Colors.plist; sourceTree = ""; }; + 1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMTextViewHelper.h; sourceTree = ""; }; + 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMTextViewHelper.m; sourceTree = ""; }; + 1D1474950C56703C0038FA2B /* MacVim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacVim.h; sourceTree = ""; }; + 1D1474960C56703C0038FA2B /* MacVim.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MacVim.m; sourceTree = ""; }; + 1D14749D0C5673AE0038FA2B /* MMAppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAppController.h; sourceTree = ""; }; + 1D14749E0C5673AE0038FA2B /* MMAppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAppController.m; sourceTree = ""; }; + 1D1474A70C5677450038FA2B /* MMTextStorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTextStorage.h; sourceTree = ""; }; + 1D1474A80C5677450038FA2B /* MMTextStorage.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTextStorage.m; sourceTree = ""; }; + 1D1474AD0C5678370038FA2B /* MMTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTextView.h; sourceTree = ""; }; + 1D1474AE0C5678370038FA2B /* MMTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTextView.m; sourceTree = ""; }; + 1D1474B30C56796D0038FA2B /* MMVimController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimController.h; sourceTree = ""; }; + 1D1474B40C56796D0038FA2B /* MMVimController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimController.m; sourceTree = ""; }; + 1D1474B90C567A910038FA2B /* MMWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMWindowController.h; sourceTree = ""; }; + 1D1474BA0C567A910038FA2B /* MMWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMWindowController.m; sourceTree = ""; }; + 1D22374A0E45DF4800E6FFFF /* Advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Advanced.png; sourceTree = ""; }; + 1D384A0D100D671700D3C22F /* KeyBinding.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = KeyBinding.plist; sourceTree = ""; }; + 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MMCoreTextView+ToolTip.m"; sourceTree = ""; }; + 1D493D570C5247BF00AB718C /* Vim */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = Vim; path = ../Vim; sourceTree = SOURCE_ROOT; }; + 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PSMTabBarControl.xcodeproj; path = PSMTabBarControl/PSMTabBarControl.xcodeproj; sourceTree = ""; }; + 1D6008820E96886D003763F0 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/FindAndReplace.nib; sourceTree = ""; }; + 1D6008890E96A0B2003763F0 /* MMFindReplaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMFindReplaceController.h; sourceTree = ""; }; + 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMFindReplaceController.m; sourceTree = ""; }; + 1D80591D0E1185EA001699D1 /* Miscellaneous.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Miscellaneous.m; sourceTree = ""; }; + 1D8059220E118663001699D1 /* Miscellaneous.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Miscellaneous.h; sourceTree = ""; }; + 1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMFullScreenWindow.h; sourceTree = ""; }; + 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMFullScreenWindow.m; sourceTree = ""; }; + 1D80FBD10CBBD3B700102A1C /* MMVimView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimView.h; sourceTree = ""; }; + 1D80FBD20CBBD3B700102A1C /* MMVimView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimView.m; sourceTree = ""; }; + 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; + 1D9918460D299F9900A96335 /* MMAtsuiTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAtsuiTextView.h; sourceTree = ""; }; + 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAtsuiTextView.m; sourceTree = ""; }; + 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacVim.icns; path = icons/MacVim.icns; sourceTree = ""; }; + 1DCD00AA0E50B2B700460166 /* Attention.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Attention.png; path = Toolbar/Attention.png; sourceTree = ""; }; + 1DCD00AB0E50B2B700460166 /* Copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Copy.png; path = Toolbar/Copy.png; sourceTree = ""; }; + 1DCD00AC0E50B2B700460166 /* Cut.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Cut.png; path = Toolbar/Cut.png; sourceTree = ""; }; + 1DCD00AD0E50B2B700460166 /* FindHelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindHelp.png; path = Toolbar/FindHelp.png; sourceTree = ""; }; + 1DCD00AE0E50B2B700460166 /* FindNext.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindNext.png; path = Toolbar/FindNext.png; sourceTree = ""; }; + 1DCD00AF0E50B2B700460166 /* FindPrev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindPrev.png; path = Toolbar/FindPrev.png; sourceTree = ""; }; + 1DCD00B00E50B2B700460166 /* Help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Help.png; path = Toolbar/Help.png; sourceTree = ""; }; + 1DCD00B10E50B2B700460166 /* LoadSesn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LoadSesn.png; path = Toolbar/LoadSesn.png; sourceTree = ""; }; + 1DCD00B20E50B2B700460166 /* Make.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Make.png; path = Toolbar/Make.png; sourceTree = ""; }; + 1DCD00B30E50B2B700460166 /* Open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Open.png; path = Toolbar/Open.png; sourceTree = ""; }; + 1DCD00B40E50B2B700460166 /* Paste.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Paste.png; path = Toolbar/Paste.png; sourceTree = ""; }; + 1DCD00B50E50B2B700460166 /* Print.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Print.png; path = Toolbar/Print.png; sourceTree = ""; }; + 1DCD00B60E50B2B700460166 /* Redo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Redo.png; path = Toolbar/Redo.png; sourceTree = ""; }; + 1DCD00B70E50B2B700460166 /* Replace.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Replace.png; path = Toolbar/Replace.png; sourceTree = ""; }; + 1DCD00B80E50B2B700460166 /* RunCtags.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RunCtags.png; path = Toolbar/RunCtags.png; sourceTree = ""; }; + 1DCD00B90E50B2B700460166 /* RunScript.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RunScript.png; path = Toolbar/RunScript.png; sourceTree = ""; }; + 1DCD00BA0E50B2B700460166 /* Save.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Save.png; path = Toolbar/Save.png; sourceTree = ""; }; + 1DCD00BB0E50B2B700460166 /* SaveAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SaveAll.png; path = Toolbar/SaveAll.png; sourceTree = ""; }; + 1DCD00BC0E50B2B700460166 /* SaveSesn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SaveSesn.png; path = Toolbar/SaveSesn.png; sourceTree = ""; }; + 1DCD00BD0E50B2B700460166 /* TagJump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TagJump.png; path = Toolbar/TagJump.png; sourceTree = ""; }; + 1DCD00BE0E50B2B700460166 /* Undo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Undo.png; path = Toolbar/Undo.png; sourceTree = ""; }; + 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; + 1DD0C20A0C60FF9A008CD84A /* gvimrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gvimrc; sourceTree = ""; }; + 1DD3D51D0D82D4C9006E4320 /* ibeam.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ibeam.png; sourceTree = ""; }; + 1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMApplication.h; sourceTree = ""; }; + 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMApplication.m; sourceTree = ""; }; + 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SystemColors.plist; sourceTree = ""; }; + 1DE3F8E60D50F80500052B9E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = ""; }; + 1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMPreferenceController.h; sourceTree = ""; }; + 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMPreferenceController.m; sourceTree = ""; }; + 1DE602470C587FD10055263D /* runtime */ = {isa = PBXFileReference; lastKnownFileType = folder; name = runtime; path = ../../runtime; sourceTree = SOURCE_ROOT; }; + 1DE63FF90E71820F00959BDB /* MMCoreTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMCoreTextView.h; sourceTree = ""; }; + 1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMCoreTextView.m; sourceTree = ""; }; + 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Actions.plist; sourceTree = ""; }; + 1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMWindow.h; sourceTree = ""; }; + 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMWindow.m; sourceTree = ""; }; + 1DED785F0C6DE43D0079945F /* vimrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vimrc; sourceTree = ""; }; + 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; + 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = ""; }; + 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8D11072E0486CEB800E47090 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */, + 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, + 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 080E96DDFE201D6D7F000001 /* MacVim Source */ = { + isa = PBXGroup; + children = ( + 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */, + 1D6008890E96A0B2003763F0 /* MMFindReplaceController.h */, + 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */, + 1DE63FF90E71820F00959BDB /* MMCoreTextView.h */, + 1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */, + 1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */, + 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */, + 1D8059220E118663001699D1 /* Miscellaneous.h */, + 1D80591D0E1185EA001699D1 /* Miscellaneous.m */, + 0395A8310D71ED7800881434 /* DBPrefsWindowController.h */, + 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */, + 1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */, + 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */, + 1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */, + 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */, + 1D9918460D299F9900A96335 /* MMAtsuiTextView.h */, + 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */, + 1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */, + 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */, + 1D80FBD10CBBD3B700102A1C /* MMVimView.h */, + 1D80FBD20CBBD3B700102A1C /* MMVimView.m */, + 1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */, + 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */, + 1D09AB3F0C6A4D520045497E /* MMTypesetter.h */, + 1D09AB400C6A4D520045497E /* MMTypesetter.m */, + 1D1474B90C567A910038FA2B /* MMWindowController.h */, + 1D1474BA0C567A910038FA2B /* MMWindowController.m */, + 1D1474B30C56796D0038FA2B /* MMVimController.h */, + 1D1474B40C56796D0038FA2B /* MMVimController.m */, + 1D1474AD0C5678370038FA2B /* MMTextView.h */, + 1D1474AE0C5678370038FA2B /* MMTextView.m */, + 1D1474A70C5677450038FA2B /* MMTextStorage.h */, + 1D1474A80C5677450038FA2B /* MMTextStorage.m */, + 1D14749D0C5673AE0038FA2B /* MMAppController.h */, + 1D14749E0C5673AE0038FA2B /* MMAppController.m */, + 1D1474950C56703C0038FA2B /* MacVim.h */, + 1D1474960C56703C0038FA2B /* MacVim.m */, + 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */, + 29B97316FDCFA39411CA2CEA /* main.m */, + ); + name = "MacVim Source"; + sourceTree = ""; + }; + 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, + ); + name = "Linked Frameworks"; + sourceTree = ""; + }; + 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + 29B97324FDCFA39411CA2CEA /* AppKit.framework */, + 29B97325FDCFA39411CA2CEA /* Foundation.framework */, + ); + name = "Other Frameworks"; + sourceTree = ""; + }; + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D1107320486CEB800E47090 /* MacVim.app */, + ); + name = Products; + sourceTree = ""; + }; + 1D0F11480D58C77800D5DA09 /* Font */ = { + isa = PBXGroup; + children = ( + ); + name = Font; + sourceTree = ""; + }; + 1D493D640C52482B00AB718C /* Executables */ = { + isa = PBXGroup; + children = ( + 1D493D570C5247BF00AB718C /* Vim */, + ); + name = Executables; + sourceTree = ""; + }; + 1D493DB40C52533B00AB718C /* Products */ = { + isa = PBXGroup; + children = ( + 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */, + ); + name = Products; + sourceTree = ""; + }; + 1DE602460C587F760055263D /* Vim Resources */ = { + isa = PBXGroup; + children = ( + 1DED785F0C6DE43D0079945F /* vimrc */, + 1DD0C20A0C60FF9A008CD84A /* gvimrc */, + 1DE602470C587FD10055263D /* runtime */, + ); + name = "Vim Resources"; + sourceTree = ""; + }; + 1DE9726C0C48050600F96A9F /* Toolbar */ = { + isa = PBXGroup; + children = ( + 1DCD00AA0E50B2B700460166 /* Attention.png */, + 1DCD00AB0E50B2B700460166 /* Copy.png */, + 1DCD00AC0E50B2B700460166 /* Cut.png */, + 1DCD00AD0E50B2B700460166 /* FindHelp.png */, + 1DCD00AE0E50B2B700460166 /* FindNext.png */, + 1DCD00AF0E50B2B700460166 /* FindPrev.png */, + 1DCD00B00E50B2B700460166 /* Help.png */, + 1DCD00B10E50B2B700460166 /* LoadSesn.png */, + 1DCD00B20E50B2B700460166 /* Make.png */, + 1DCD00B30E50B2B700460166 /* Open.png */, + 1DCD00B40E50B2B700460166 /* Paste.png */, + 1DCD00B50E50B2B700460166 /* Print.png */, + 1DCD00B60E50B2B700460166 /* Redo.png */, + 1DCD00B70E50B2B700460166 /* Replace.png */, + 1DCD00B80E50B2B700460166 /* RunCtags.png */, + 1DCD00B90E50B2B700460166 /* RunScript.png */, + 1DCD00BA0E50B2B700460166 /* Save.png */, + 1DCD00BB0E50B2B700460166 /* SaveAll.png */, + 1DCD00BC0E50B2B700460166 /* SaveSesn.png */, + 1DCD00BD0E50B2B700460166 /* TagJump.png */, + 1DCD00BE0E50B2B700460166 /* Undo.png */, + ); + name = Toolbar; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* MacVim */ = { + isa = PBXGroup; + children = ( + 1D493D640C52482B00AB718C /* Executables */, + 080E96DDFE201D6D7F000001 /* MacVim Source */, + 29B97317FDCFA39411CA2CEA /* Resources */, + 1DE602460C587F760055263D /* Vim Resources */, + 29B97323FDCFA39411CA2CEA /* Frameworks */, + 19C28FACFE9D520D11CA2CBB /* Products */, + ); + name = MacVim; + sourceTree = ""; + }; + 29B97317FDCFA39411CA2CEA /* Resources */ = { + isa = PBXGroup; + children = ( + 1D384A0D100D671700D3C22F /* KeyBinding.plist */, + 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */, + 1D8BEA73104992290069B072 /* FindAndReplace.nib */, + 0395A8A90D72D88B00881434 /* General.png */, + 1D22374A0E45DF4800E6FFFF /* Advanced.png */, + 1DD3D51D0D82D4C9006E4320 /* ibeam.png */, + 1D0F11480D58C77800D5DA09 /* Font */, + 1DE9726C0C48050600F96A9F /* Toolbar */, + 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */, + 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */, + 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */, + 1D0E051B0BA5F83800B6049E /* Colors.plist */, + 8D1107310486CEB800E47090 /* Info.plist */, + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, + 1DE3F8E50D50F80500052B9E /* Preferences.nib */, + 29B97318FDCFA39411CA2CEA /* MainMenu.nib */, + ); + name = Resources; + sourceTree = ""; + }; + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */, + 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */, + 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, + 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8D1107260486CEB800E47090 /* MacVim */ = { + isa = PBXNativeTarget; + buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MacVim" */; + buildPhases = ( + 8D1107290486CEB800E47090 /* Resources */, + 8D11072C0486CEB800E47090 /* Sources */, + 8D11072E0486CEB800E47090 /* Frameworks */, + 1D0DCAD80BA3604D00B6CCFA /* Copy Executables */, + 1D9EB2840C366D7B0074B739 /* Copy Frameworks */, + 1DE608B80C58807F0055263D /* Copy Vim Runtime Files */, + 1D1C31F00EFFBFD6003FE9A5 /* Make Document Icons */, + ); + buildRules = ( + ); + dependencies = ( + 1D493DCD0C5254A400AB718C /* PBXTargetDependency */, + ); + name = MacVim; + productInstallPath = "$(HOME)/Applications"; + productName = MacVim; + productReference = 8D1107320486CEB800E47090 /* MacVim.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + Swedish, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* MacVim */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1D493DB40C52533B00AB718C /* Products */; + ProjectRef = 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + 8D1107260486CEB800E47090 /* MacVim */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = PSMTabBarControl.framework; + remoteRef = 1D493DB80C52533B00AB718C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D1107290486CEB800E47090 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */, + 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, + 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */, + 1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */, + 1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */, + 1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */, + 1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */, + 0395A8AA0D72D88B00881434 /* General.png in Resources */, + 1DD3D51E0D82D4C9006E4320 /* ibeam.png in Resources */, + 1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */, + 1DCD00BF0E50B2B700460166 /* Attention.png in Resources */, + 1DCD00C00E50B2B700460166 /* Copy.png in Resources */, + 1DCD00C10E50B2B700460166 /* Cut.png in Resources */, + 1DCD00C20E50B2B700460166 /* FindHelp.png in Resources */, + 1DCD00C30E50B2B700460166 /* FindNext.png in Resources */, + 1DCD00C40E50B2B700460166 /* FindPrev.png in Resources */, + 1DCD00C50E50B2B700460166 /* Help.png in Resources */, + 1DCD00C60E50B2B700460166 /* LoadSesn.png in Resources */, + 1DCD00C70E50B2B700460166 /* Make.png in Resources */, + 1DCD00C80E50B2B700460166 /* Open.png in Resources */, + 1DCD00C90E50B2B700460166 /* Paste.png in Resources */, + 1DCD00CA0E50B2B700460166 /* Print.png in Resources */, + 1DCD00CB0E50B2B700460166 /* Redo.png in Resources */, + 1DCD00CC0E50B2B700460166 /* Replace.png in Resources */, + 1DCD00CD0E50B2B700460166 /* RunCtags.png in Resources */, + 1DCD00CE0E50B2B700460166 /* RunScript.png in Resources */, + 1DCD00CF0E50B2B700460166 /* Save.png in Resources */, + 1DCD00D00E50B2B700460166 /* SaveAll.png in Resources */, + 1DCD00D10E50B2B700460166 /* SaveSesn.png in Resources */, + 1DCD00D20E50B2B700460166 /* TagJump.png in Resources */, + 1DCD00D30E50B2B700460166 /* Undo.png in Resources */, + 1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */, + 1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */, + 1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 1D1C31F00EFFBFD6003FE9A5 /* Make Document Icons */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Make Document Icons"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Clear deployment target, else the python script always thinks we're building on Tiger\nunset MACOSX_DEPLOYMENT_TARGET\n\n# Generate the icons (redirect stderr to ignore warnings)\ncd \"$PROJECT_DIR\"/icons/\nmake OUTDIR=\"$TARGET_BUILD_DIR\"/$UNLOCALIZED_RESOURCES_FOLDER_PATH 2> /dev/null\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8D11072C0486CEB800E47090 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D11072D0486CEB800E47090 /* main.m in Sources */, + 1D1474980C56703C0038FA2B /* MacVim.m in Sources */, + 1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */, + 1D1474AA0C5677450038FA2B /* MMTextStorage.m in Sources */, + 1D1474B00C5678370038FA2B /* MMTextView.m in Sources */, + 1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */, + 1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */, + 1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */, + 1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */, + 1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */, + 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */, + 1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */, + 1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */, + 1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */, + 0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */, + 1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */, + 1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */, + 1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */, + 1DE63FFB0E71820F00959BDB /* MMCoreTextView.m in Sources */, + 1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 1D493DCD0C5254A400AB718C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = PSMTabBarControlFramework; + targetProxy = 1D493DCC0C5254A400AB718C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C165DFE840E0CC02AAC07 /* English */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 1D8BEA73104992290069B072 /* FindAndReplace.nib */ = { + isa = PBXVariantGroup; + children = ( + 1D6008820E96886D003763F0 /* English */, + ); + name = FindAndReplace.nib; + sourceTree = ""; + }; + 1DE3F8E50D50F80500052B9E /* Preferences.nib */ = { + isa = PBXVariantGroup; + children = ( + 1DE3F8E60D50F80500052B9E /* English */, + ); + name = Preferences.nib; + sourceTree = ""; + }; + 29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = { + isa = PBXVariantGroup; + children = ( + 29B97319FDCFA39411CA2CEA /* English */, + ); + name = MainMenu.nib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + C01FCF4B08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 78; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + 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; + INSTALL_PATH = "$(HOME)/Applications"; + MACOSX_DEPLOYMENT_TARGET = ""; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; + WARNING_CFLAGS = "-Wall"; + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Debug; + }; + C01FCF4C08A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 78; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; + GCC_DYNAMIC_NO_PIC = YES; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + 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"; + MACOSX_DEPLOYMENT_TARGET = ""; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + GCC_VERSION = 4.2; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; + PREBINDING = NO; + SYMROOT = "$(PROJECT_DIR)/build"; + }; + name = Debug; + }; + C01FCF5008A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + GCC_VERSION = 4.2; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; + PREBINDING = NO; + SYMROOT = "$(PROJECT_DIR)/build"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MacVim" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4B08A954540054247B /* Debug */, + C01FCF4C08A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4F08A954540054247B /* Debug */, + C01FCF5008A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} diff --git a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj index 2346afea21..89a887af95 100644 --- a/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj +++ b/src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -432,8 +432,11 @@ /* Begin PBXProject section */ 0259C573FE90428111CA0C5A /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0710; + }; buildConfigurationList = C056398B08A954F8003078D8 /* Build configuration list for PBXProject "PSMTabBarControl" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -564,7 +567,7 @@ C056398008A954F8003078D8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -580,6 +583,7 @@ INSTALL_PATH = "@executable_path/../Frameworks"; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; + PRODUCT_BUNDLE_IDENTIFIER = com.positivespinmedia.PSMTabBarControlFramework; PRODUCT_NAME = PSMTabBarControl; SYMROOT = ../build; ZERO_LINK = NO; @@ -589,7 +593,7 @@ C056398108A954F8003078D8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -602,6 +606,7 @@ INSTALL_PATH = "@executable_path/../Frameworks"; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; + PRODUCT_BUNDLE_IDENTIFIER = com.positivespinmedia.PSMTabBarControlFramework; PRODUCT_NAME = PSMTabBarControl; SYMROOT = ../build; }; @@ -628,10 +633,6 @@ C056398908A954F8003078D8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; PRODUCT_NAME = All; @@ -646,7 +647,7 @@ C056398C08A954F8003078D8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + ENABLE_TESTABILITY = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; @@ -658,7 +659,6 @@ C056398D08A954F8003078D8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; diff --git a/src/MacVim/PSMTabBarControl/PSMTabBarControlFramework-Info.plist b/src/MacVim/PSMTabBarControl/PSMTabBarControlFramework-Info.plist index f7840b712b..3e49e9a9d0 100644 --- a/src/MacVim/PSMTabBarControl/PSMTabBarControlFramework-Info.plist +++ b/src/MacVim/PSMTabBarControl/PSMTabBarControlFramework-Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -7,7 +7,7 @@ CFBundleExecutable PSMTabBarControl CFBundleIdentifier - com.positivespinmedia.PSMTabBarControlFramework + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/src/Makefile b/src/Makefile index 84a93f7230..ed4ff41168 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2934,7 +2934,7 @@ RELEASEDIR = MacVim/build/Release DMGDIR = MacVim/build/dmg macvim: $(VIMTARGET) - xcodebuild -project MacVim/MacVim.xcodeproj $(XCODEFLAGS) + xcodebuild -project MacVim/$(XCODEPROJ) $(XCODEFLAGS) macvim-dmg: macvim mkdir -p $(DMGDIR) @@ -2954,7 +2954,7 @@ macvim-dmg: macvim macvimclean: if test -d MacVim; then \ - xcodebuild -project MacVim/MacVim.xcodeproj clean; \ + xcodebuild -project MacVim/$(XCODEPROJ) clean; \ fi diff --git a/src/auto/configure b/src/auto/configure index cdc0819a4a..d6a648fe5e 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -623,6 +623,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS LINK_AS_NEEDED DEPEND_CFLAGS_FILTER +XCODEPROJ XCODEFLAGS MAKEMO MSGFMT @@ -13470,6 +13471,13 @@ fi + + macosx_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'` + case "$macosx_version" in + 10.4|10.5) XCODEPROJ="MacVim_legacy.xcodeproj";; + *) XCODEPROJ="MacVim.xcodeproj";; + esac + fi diff --git a/src/config.mk.in b/src/config.mk.in index e4b28a4f2f..533b238776 100644 --- a/src/config.mk.in +++ b/src/config.mk.in @@ -21,6 +21,7 @@ CC = @CC@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +XCODEPROJ = @XCODEPROJ@ XCODEFLAGS = @XCODEFLAGS@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/configure.in b/src/configure.in index 39e383ce8c..10badbd106 100644 --- a/src/configure.in +++ b/src/configure.in @@ -4079,6 +4079,13 @@ if test "x$MACOSX" = "xyes"; then [ AC_MSG_RESULT(using default) ]) AC_SUBST(XCODEFLAGS) + + macosx_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([[0-9]]*\.[[0-9]]*\).*/\1/'` + case "$macosx_version" in + 10.4|10.5) XCODEPROJ="MacVim_legacy.xcodeproj";; + *) XCODEPROJ="MacVim.xcodeproj";; + esac + AC_SUBST(XCODEPROJ) fi