From ea1b48967ce34718d2645c4a30fab6b67e66f9fa Mon Sep 17 00:00:00 2001 From: avenjamin Date: Sun, 20 Dec 2009 01:19:52 +0000 Subject: - Updating Growl to 1.2 - Updating BWToolkit to 1.2.2 - Changed BWToolkit from building it ourselves to just include the latest release of the framework - Changed build settings to build 32 and 64 universal binaries - Changed compiler to Clang --- sequel-pro.xcodeproj/project.pbxproj | 87 ++++-------------------------------- 1 file changed, 8 insertions(+), 79 deletions(-) (limited to 'sequel-pro.xcodeproj') diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 924890d1..9ed15144 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -171,12 +171,12 @@ B52460D70F8EF92300171639 /* SPArrayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B52460D40F8EF92300171639 /* SPArrayAdditions.m */; }; B52460D80F8EF92300171639 /* SPTextViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B52460D60F8EF92300171639 /* SPTextViewAdditions.m */; }; B52460DB0F8EF93B00171639 /* Console.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52460D90F8EF93B00171639 /* Console.xib */; }; + B52ECDDC10DDACE9009DC3E8 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52ECDDB10DDACE9009DC3E8 /* BWToolkitFramework.framework */; }; + B52ECE1410DDAD01009DC3E8 /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B52ECDDB10DDACE9009DC3E8 /* BWToolkitFramework.framework */; }; B53857340F9CC3B600EB2354 /* button_clear.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B53857330F9CC3B600EB2354 /* button_clear.tiff */; }; B54F25E60FD909C400E2CF36 /* toolbar-switch-to-table-relations.png in Resources */ = {isa = PBXBuildFile; fileRef = B54F25E50FD909C400E2CF36 /* toolbar-switch-to-table-relations.png */; }; B5538AAF0FF251EE00219803 /* button_pane_hide_icon.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5538AAC0FF251EE00219803 /* button_pane_hide_icon.tif */; }; B5538AB00FF251EE00219803 /* button_pane_show_icon.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5538AAD0FF251EE00219803 /* button_pane_show_icon.tif */; }; - B5538E730FF279F300219803 /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B5538CE30FF279AD00219803 /* BWToolkitFramework.framework */; }; - B5538EA00FF27CD400219803 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5538CE30FF279AD00219803 /* BWToolkitFramework.framework */; }; B57747D20F7A891A003B34F9 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = B57747D00F7A891A003B34F9 /* Preferences.xib */; }; B57747D40F7A8974003B34F9 /* SPPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = B57747D30F7A8974003B34F9 /* SPPreferenceController.m */; }; B57747D90F7A8990003B34F9 /* SPWindowAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B57747D80F7A8990003B34F9 /* SPWindowAdditions.m */; }; @@ -263,34 +263,6 @@ remoteGlobalIDString = 58CDB3350FCE13C900F8ACA3; remoteInfo = TunnelPassphraseRequester; }; - B5538CE00FF279AD00219803 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5538CD70FF279AD00219803 /* BWToolkit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8D1AC9740486D14A00FE50C9; - remoteInfo = BWToolkit; - }; - B5538CE20FF279AD00219803 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5538CD70FF279AD00219803 /* BWToolkit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 53DF68FD067E5B5A0090B5B0; - remoteInfo = BWToolkitFramework; - }; - B5538E7B0FF27A2200219803 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5538CD70FF279AD00219803 /* BWToolkit.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0; - remoteInfo = BWToolkitFramework; - }; - B5B90FDB0FF3BBC900E7B012 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5538CD70FF279AD00219803 /* BWToolkit.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D1AC9600486D14A00FE50C9; - remoteInfo = BWToolkit; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -301,9 +273,9 @@ dstSubfolderSpec = 10; files = ( 17B7B61D101605E300F057DE /* MCPKit.framework in CopyFiles */, - B5538E730FF279F300219803 /* BWToolkitFramework.framework in CopyFiles */, 4DECC4910EC2B436008D359E /* Growl.framework in CopyFiles */, 4DECC48F0EC2B436008D359E /* Sparkle.framework in CopyFiles */, + B52ECE1410DDAD01009DC3E8 /* BWToolkitFramework.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -587,11 +559,11 @@ B52460D50F8EF92300171639 /* SPTextViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTextViewAdditions.h; sourceTree = ""; }; B52460D60F8EF92300171639 /* SPTextViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTextViewAdditions.m; sourceTree = ""; }; B52460DA0F8EF93B00171639 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Console.xib; sourceTree = ""; }; + B52ECDDB10DDACE9009DC3E8 /* BWToolkitFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BWToolkitFramework.framework; path = Frameworks/BWToolkitFramework.framework; sourceTree = ""; }; B53857330F9CC3B600EB2354 /* button_clear.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_clear.tiff; sourceTree = ""; }; B54F25E50FD909C400E2CF36 /* toolbar-switch-to-table-relations.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toolbar-switch-to-table-relations.png"; sourceTree = ""; }; B5538AAC0FF251EE00219803 /* button_pane_hide_icon.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_pane_hide_icon.tif; sourceTree = ""; }; B5538AAD0FF251EE00219803 /* button_pane_show_icon.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_pane_show_icon.tif; sourceTree = ""; }; - B5538CD70FF279AD00219803 /* BWToolkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BWToolkit.xcodeproj; path = Frameworks/BWToolkitFramework.framework/BWToolkit.xcodeproj; sourceTree = ""; }; B57747D10F7A891A003B34F9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = ""; }; B57747D30F7A8974003B34F9 /* SPPreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPPreferenceController.m; sourceTree = ""; }; B57747D50F7A8978003B34F9 /* SPPreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPPreferenceController.h; sourceTree = ""; }; @@ -702,7 +674,6 @@ files = ( 296DC8BF0F9091DF002A3258 /* libicucore.dylib in Frameworks */, 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */, - B5538EA00FF27CD400219803 /* BWToolkitFramework.framework in Frameworks */, 4DECC3370EC2A170008D359E /* Growl.framework in Frameworks */, B5EAC0FD0EC87FF900CC579C /* Security.framework in Frameworks */, 4DECC3350EC2A170008D359E /* Sparkle.framework in Frameworks */, @@ -710,6 +681,7 @@ 17B7B5991016038400F057DE /* MCPKit.framework in Frameworks */, BCC5CC3C103EEE49007CE557 /* libz.dylib in Frameworks */, 58C458DF10CF188F00E6E13E /* libcrypto.dylib in Frameworks */, + B52ECDDC10DDACE9009DC3E8 /* BWToolkitFramework.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -719,9 +691,9 @@ 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - B5538CD70FF279AD00219803 /* BWToolkit.xcodeproj */, 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */, 4DECC3340EC2A170008D359E /* Growl.framework */, + B52ECDDB10DDACE9009DC3E8 /* BWToolkitFramework.framework */, 4DECC3320EC2A170008D359E /* Sparkle.framework */, 296DC89E0F8FD336002A3258 /* WebKit.framework */, 296DC8BE0F9091DF002A3258 /* libicucore.dylib */, @@ -1402,15 +1374,6 @@ name = Parsing; sourceTree = ""; }; - B5538CD80FF279AD00219803 /* Products */ = { - isa = PBXGroup; - children = ( - B5538CE10FF279AD00219803 /* BWToolkit.ibplugin */, - B5538CE30FF279AD00219803 /* BWToolkitFramework.framework */, - ); - name = Products; - sourceTree = ""; - }; B57747D60F7A8990003B34F9 /* Category Additions */ = { isa = PBXGroup; children = ( @@ -1531,8 +1494,6 @@ dependencies = ( 17B7B59B1016039200F057DE /* PBXTargetDependency */, 58CDB34B0FCE144000F8ACA3 /* PBXTargetDependency */, - B5538E7C0FF27A2200219803 /* PBXTargetDependency */, - B5B90FDC0FF3BBC900E7B012 /* PBXTargetDependency */, ); name = "Sequel Pro"; productInstallPath = "$(HOME)/Applications"; @@ -1550,12 +1511,6 @@ hasScannedForEncodings = 1; mainGroup = 2A37F4AAFDCFA73011CA2CEA /* sequel-pro */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = B5538CD80FF279AD00219803 /* Products */; - ProjectRef = B5538CD70FF279AD00219803 /* BWToolkit.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 8D15AC270486D014006FF6A4 /* Sequel Pro */, @@ -1566,23 +1521,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - B5538CE10FF279AD00219803 /* BWToolkit.ibplugin */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BWToolkit.ibplugin; - remoteRef = B5538CE00FF279AD00219803 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B5538CE30FF279AD00219803 /* BWToolkitFramework.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BWToolkitFramework.framework; - remoteRef = B5538CE20FF279AD00219803 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 8D15AC2B0486D014006FF6A4 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1863,16 +1801,6 @@ target = 58CDB3350FCE13C900F8ACA3 /* SequelProTunnelAssistant */; targetProxy = 58CDB34A0FCE144000F8ACA3 /* PBXContainerItemProxy */; }; - B5538E7C0FF27A2200219803 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = BWToolkitFramework; - targetProxy = B5538E7B0FF27A2200219803 /* PBXContainerItemProxy */; - }; - B5B90FDC0FF3BBC900E7B012 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = BWToolkit; - targetProxy = B5B90FDB0FF3BBC900E7B012 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -2458,8 +2386,9 @@ C05733CD08A9546B00998B17 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IBC_WARNINGS = YES; -- cgit v1.2.3