From faafa14b29d618a5342891214101da1bf2fbff80 Mon Sep 17 00:00:00 2001 From: Abhi Beckert Date: Fri, 4 Mar 2016 18:02:44 +1000 Subject: Remove bundled zlib #1927 --- sequel-pro.xcodeproj/project.pbxproj | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'sequel-pro.xcodeproj') diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index aaca3759..1ddbc8de 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -171,6 +171,7 @@ 384582C40FB95FF800DDACB6 /* func-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 384582C30FB95FF800DDACB6 /* func-small.png */; }; 384582C70FB9603600DDACB6 /* proc-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 384582C60FB9603600DDACB6 /* proc-small.png */; }; 387BBBA80FBCB6CB00B31746 /* SPTableRelations.m in Sources */ = {isa = PBXBuildFile; fileRef = 387BBBA70FBCB6CB00B31746 /* SPTableRelations.m */; }; + 38C613731C8977E600B3B6EF /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 38C613721C8977E600B3B6EF /* libz.tbd */; }; 4D90B79A101E0CDF00D116A1 /* SPUserManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D90B799101E0CDF00D116A1 /* SPUserManager.m */; }; 4D90B79E101E0CF200D116A1 /* SPUserManager.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 4D90B79B101E0CF200D116A1 /* SPUserManager.xcdatamodel */; }; 4D90B79F101E0CF200D116A1 /* SPUserMO.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D90B79D101E0CF200D116A1 /* SPUserMO.m */; }; @@ -923,6 +924,8 @@ 384582C60FB9603600DDACB6 /* proc-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "proc-small.png"; sourceTree = ""; }; 387BBBA60FBCB6CB00B31746 /* SPTableRelations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableRelations.h; sourceTree = ""; }; 387BBBA70FBCB6CB00B31746 /* SPTableRelations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableRelations.m; sourceTree = ""; }; + 38C613701C89777B00B3B6EF /* libz.1.2.5.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.2.5.tbd; path = usr/lib/libz.1.2.5.tbd; sourceTree = SDKROOT; }; + 38C613721C8977E600B3B6EF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 38F37194182F0621008EB031 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = readme.md; sourceTree = ""; }; 4D90B798101E0CDF00D116A1 /* SPUserManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUserManager.h; sourceTree = ""; }; 4D90B799101E0CDF00D116A1 /* SPUserManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUserManager.m; sourceTree = ""; }; @@ -1034,7 +1037,6 @@ 582F02301370B52600B30621 /* SPExportFileNameTokenObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPExportFileNameTokenObject.m; sourceTree = ""; }; 583CA21312EC8B2200C9E763 /* SPWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPWindow.h; sourceTree = ""; }; 583CA21412EC8B2200C9E763 /* SPWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPWindow.m; sourceTree = ""; }; - 583CE39C11722B84008F148E /* zlib.1.2.4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zlib.1.2.4.h; path = Frameworks/zlib/zlib.1.2.4.h; sourceTree = SOURCE_ROOT; }; 584094CC1107BD0500260CFD /* SPAlertSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPAlertSheets.h; sourceTree = ""; }; 584095181107CB6600260CFD /* SPAlertSheets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPAlertSheets.m; sourceTree = ""; }; 5841423D0F97E11000A34B47 /* NoodleLineNumberView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoodleLineNumberView.h; sourceTree = ""; }; @@ -1376,6 +1378,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 38C613731C8977E600B3B6EF /* libz.tbd in Frameworks */, 503CDBB21ACDC204004F8A2F /* Quartz.framework in Frameworks */, 17AED4161888BD67008E380F /* Security.framework in Frameworks */, 296DC8BF0F9091DF002A3258 /* libicucore.dylib in Frameworks */, @@ -1463,14 +1466,6 @@ name = "Table Triggers"; sourceTree = ""; }; - 170DBD5815BEBE39007E95AB /* zlib */ = { - isa = PBXGroup; - children = ( - 583CE39C11722B84008F148E /* zlib.1.2.4.h */, - ); - name = zlib; - sourceTree = ""; - }; 171312CF109D23CA00FB465F /* Cells */ = { isa = PBXGroup; children = ( @@ -1938,7 +1933,6 @@ 584D88A81515034200F24774 /* NSNotificationCenterThreadingAdditions.m */, 5841929F101E57BB0089807F /* NSMutableArray-MultipleSort.h */, 584192A0101E57BB0089807F /* NSMutableArray-MultipleSort.m */, - 170DBD5815BEBE39007E95AB /* zlib */, 17DC8826126B22F200E9AAEC /* Views */, 58B909A111C3B8EC000826E5 /* Localization */, 177486451528EE820036121C /* RegexKitLite */, @@ -2024,7 +2018,7 @@ isa = PBXGroup; children = ( 17E5955314F304000054EE08 /* QueryKit.framework */, - 17E596A214F307CE0054EE08 /* Tests.octest */, + 17E596A214F307CE0054EE08 /* Tests.xctest */, ); name = Products; sourceTree = ""; @@ -2421,6 +2415,8 @@ 2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 38C613721C8977E600B3B6EF /* libz.tbd */, + 38C613701C89777B00B3B6EF /* libz.1.2.5.tbd */, 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */, ); name = Frameworks; @@ -2904,10 +2900,10 @@ remoteRef = 17E5955214F304000054EE08 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 17E596A214F307CE0054EE08 /* Tests.octest */ = { + 17E596A214F307CE0054EE08 /* Tests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = Tests.octest; + path = Tests.xctest; remoteRef = 17E596A114F307CE0054EE08 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -4050,7 +4046,7 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks/zlib"; MACOSX_DEPLOYMENT_TARGET = 10.6; - OTHER_LDFLAGS = "$(SRCROOT)/Frameworks/zlib/libz.a"; + OTHER_LDFLAGS = ""; PRODUCT_NAME = "Sequel Pro"; SEPARATE_STRIP = NO; }; @@ -4250,7 +4246,7 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks/zlib"; MACOSX_DEPLOYMENT_TARGET = 10.6; - OTHER_LDFLAGS = "$(SRCROOT)/Frameworks/zlib/libz.a"; + OTHER_LDFLAGS = ""; PRODUCT_NAME = "Sequel Pro"; SEPARATE_STRIP = NO; }; @@ -4274,7 +4270,7 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks/zlib"; MACOSX_DEPLOYMENT_TARGET = 10.6; - OTHER_LDFLAGS = "$(SRCROOT)/Frameworks/zlib/libz.a"; + OTHER_LDFLAGS = ""; PRODUCT_NAME = "Sequel Pro"; SEPARATE_STRIP = NO; }; -- cgit v1.2.3