Skip to content
Browse files

Include ZeroKit as a submodule and Xcode project dependency.

  • Loading branch information...
1 parent 98e8ebe commit 133a559bba995c35620e5689c4eefa79eb6b13aa @eczarny committed
Showing with 67 additions and 16 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 Frameworks/ZeroKit
  3. +63 −16 Spectacle.xcodeproj/project.pbxproj
View
3 .gitmodules
@@ -0,0 +1,3 @@
+[submodule "Frameworks/ZeroKit"]
+ path = Frameworks/ZeroKit
+ url = git@github.com:eczarny/zerokit.git
1 Frameworks/ZeroKit
@@ -0,0 +1 @@
+Subproject commit e5d04aaced51e16a8688e861c5f29ff7e32a7a22
View
79 Spectacle.xcodeproj/project.pbxproj
@@ -16,13 +16,11 @@
070D2B29128B52A90022D02C /* SliderHandlePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 070D2B25128B52A90022D02C /* SliderHandlePressed.png */; };
070D2B2A128B52A90022D02C /* SliderMask.png in Resources */ = {isa = PBXBuildFile; fileRef = 070D2B26128B52A90022D02C /* SliderMask.png */; };
070D2B2B128B52A90022D02C /* SliderBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 070D2B27128B52A90022D02C /* SliderBackground.png */; };
- 070D2CD611E4C08D00C8DC0A /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 07CCF9E811E41E850054483C /* Sparkle.framework */; };
072EAD00118A4D5A0015FC8A /* SpectacleWindowPositionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 072EACFF118A4D5A0015FC8A /* SpectacleWindowPositionManager.m */; };
0747DB051183ACC600F75DD2 /* SpectaclePreferencePane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0747DB031183ACC600F75DD2 /* SpectaclePreferencePane.xib */; };
0747DB081183ACD600F75DD2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0747DB061183ACD600F75DD2 /* InfoPlist.strings */; };
074A8F72119FAF9300940841 /* Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0706C0431191092B0068F04B /* Defaults.plist */; };
074F0B8112BD5E3100A8CF3F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 074F0B8012BD5E3100A8CF3F /* QuartzCore.framework */; };
- 0752C74811E4D6B900AB6A46 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07CCF9E811E41E850054483C /* Sparkle.framework */; };
0766438A11A212A800B7BFA3 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0766438911A212A800B7BFA3 /* CoreServices.framework */; };
076644FB11A212D700B7BFA3 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07E632151187AAD800451374 /* Carbon.framework */; };
07678097118679C600614FB5 /* SpectacleHotKeyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 07678096118679C600614FB5 /* SpectacleHotKeyManager.m */; };
@@ -31,10 +29,6 @@
077939041184FB3C0013BC14 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
077939131184FCD20013BC14 /* SpectacleHelper.xib in Resources */ = {isa = PBXBuildFile; fileRef = 077939111184FCD20013BC14 /* SpectacleHelper.xib */; };
079CDA0F1221BAFF0099612C /* SpectacleHistoryItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 079CDA0E1221BAFF0099612C /* SpectacleHistoryItem.m */; };
- 07BB53DC118655F10045663F /* ZeroKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07BB53DB118655F10045663F /* ZeroKit.framework */; };
- 07BB53E5118656050045663F /* ZeroKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07BB53DB118655F10045663F /* ZeroKit.framework */; };
- 07BB53FE1186565B0045663F /* ZeroKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 07BB53DB118655F10045663F /* ZeroKit.framework */; };
- 07BB53FF1186565E0045663F /* ZeroKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 07BB53DB118655F10045663F /* ZeroKit.framework */; };
07BB5406118657190045663F /* SpectacleHelperApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07BB5405118657190045663F /* SpectacleHelperApplicationController.m */; };
07BB542D1186662F0045663F /* SpectacleUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 07BB542C1186662F0045663F /* SpectacleUtilities.m */; };
07BB542E1186662F0045663F /* SpectacleUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 07BB542C1186662F0045663F /* SpectacleUtilities.m */; };
@@ -42,6 +36,11 @@
07BB544D11866B090045663F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 07BB544A11866B090045663F /* Localizable.strings */; };
07C9360B11E7809900735C13 /* dsa_public.pem in Resources */ = {isa = PBXBuildFile; fileRef = 07CCF9F911E41F2B0054483C /* dsa_public.pem */; };
07E632161187AAD800451374 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07E632151187AAD800451374 /* Carbon.framework */; };
+ 2D6540741475EB90000133CA /* ZeroKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D6540721475EAE1000133CA /* ZeroKit.framework */; };
+ 2D6540751475EBF4000133CA /* ZeroKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 2D6540721475EAE1000133CA /* ZeroKit.framework */; };
+ 2D65407B1475ECCA000133CA /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D65407A1475ECCA000133CA /* Sparkle.framework */; };
+ 2D65407D1475ECD5000133CA /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 2D65407A1475ECCA000133CA /* Sparkle.framework */; };
+ 2D65407F1475ECF1000133CA /* ZeroKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D65407E1475ECF1000133CA /* ZeroKit.framework */; };
8D202CF10486D31800D8A456 /* SpectaclePreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = F506C03D013D9D7901CA16C8 /* SpectaclePreferencePane.m */; };
8D202CF30486D31800D8A456 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
8D202CF40486D31800D8A456 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F506C035013D953901CA16C8 /* PreferencePanes.framework */; };
@@ -55,6 +54,13 @@
remoteGlobalIDString = 077938B51184F96A0013BC14;
remoteInfo = SpectacleHelper;
};
+ 2D6540711475EAE1000133CA /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 2D65406A1475EAE1000133CA /* ZeroKit.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
+ remoteInfo = ZeroKit;
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -64,8 +70,8 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
- 070D2CD611E4C08D00C8DC0A /* Sparkle.framework in Copy Frameworks */,
- 07BB53FF1186565E0045663F /* ZeroKit.framework in Copy Frameworks */,
+ 2D65407D1475ECD5000133CA /* Sparkle.framework in Copy Frameworks */,
+ 2D6540751475EBF4000133CA /* ZeroKit.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -76,7 +82,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
- 07BB53FE1186565B0045663F /* ZeroKit.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -122,18 +127,19 @@
078B0F50118D18CC004EE86C /* SpectacleConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpectacleConstants.h; sourceTree = "<group>"; };
079CDA0D1221BAFF0099612C /* SpectacleHistoryItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpectacleHistoryItem.h; sourceTree = "<group>"; };
079CDA0E1221BAFF0099612C /* SpectacleHistoryItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpectacleHistoryItem.m; sourceTree = "<group>"; };
- 07BB53DB118655F10045663F /* ZeroKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZeroKit.framework; path = Library/Frameworks/ZeroKit.framework; sourceTree = SDKROOT; };
07BB5404118657190045663F /* SpectacleHelperApplicationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpectacleHelperApplicationController.h; sourceTree = "<group>"; };
07BB5405118657190045663F /* SpectacleHelperApplicationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpectacleHelperApplicationController.m; sourceTree = "<group>"; };
07BB542B1186662F0045663F /* SpectacleUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpectacleUtilities.h; sourceTree = "<group>"; };
07BB542C1186662F0045663F /* SpectacleUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpectacleUtilities.m; sourceTree = "<group>"; };
07BB544B11866B090045663F /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = Languages/English.lproj/Localizable.strings; sourceTree = "<group>"; };
- 07CCF9E811E41E850054483C /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Library/Frameworks/Sparkle.framework; sourceTree = SDKROOT; };
07CCF9F911E41F2B0054483C /* dsa_public.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_public.pem; path = Resources/Sparkle/dsa_public.pem; sourceTree = "<group>"; };
07E632151187AAD800451374 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ 2D65406A1475EAE1000133CA /* ZeroKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZeroKit.xcodeproj; path = Frameworks/ZeroKit/ZeroKit.xcodeproj; sourceTree = "<group>"; };
+ 2D65407A1475ECCA000133CA /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../../../../Library/Frameworks/Sparkle.framework; sourceTree = "<group>"; };
+ 2D65407E1475ECF1000133CA /* ZeroKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZeroKit.framework; path = "../../../Library/Developer/Xcode/DerivedData/Spectacle-gfuhcjgbmgbmfqaeerwhcojqjawa/Build/Products/Development/ZeroKit.framework"; sourceTree = "<group>"; };
32DBCFA20370C41700C91783 /* Spectacle.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Spectacle.pch; sourceTree = "<group>"; };
8D202CF70486D31800D8A456 /* Spectacle-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Spectacle-Info.plist"; path = "Resources/Property Lists/Spectacle-Info.plist"; sourceTree = "<group>"; };
8D202CF80486D31800D8A456 /* Spectacle.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Spectacle.prefPane; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -149,8 +155,8 @@
files = (
07E632161187AAD800451374 /* Carbon.framework in Frameworks */,
077939041184FB3C0013BC14 /* Cocoa.framework in Frameworks */,
- 0752C74811E4D6B900AB6A46 /* Sparkle.framework in Frameworks */,
- 07BB53E5118656050045663F /* ZeroKit.framework in Frameworks */,
+ 2D65407B1475ECCA000133CA /* Sparkle.framework in Frameworks */,
+ 2D6540741475EB90000133CA /* ZeroKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -163,7 +169,7 @@
0766438A11A212A800B7BFA3 /* CoreServices.framework in Frameworks */,
8D202CF40486D31800D8A456 /* PreferencePanes.framework in Frameworks */,
074F0B8112BD5E3100A8CF3F /* QuartzCore.framework in Frameworks */,
- 07BB53DC118655F10045663F /* ZeroKit.framework in Frameworks */,
+ 2D65407F1475ECF1000133CA /* ZeroKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -316,6 +322,7 @@
089C166AFE841209C02AAC07 /* Spectacle */ = {
isa = PBXGroup;
children = (
+ 2D65406A1475EAE1000133CA /* ZeroKit.xcodeproj */,
08FB77AFFE84173DC02AAC07 /* Classes */,
32DBCFA10370C40200C91783 /* Other Sources */,
089C167CFE841241C02AAC07 /* Resources */,
@@ -367,8 +374,8 @@
0766438911A212A800B7BFA3 /* CoreServices.framework */,
F506C035013D953901CA16C8 /* PreferencePanes.framework */,
074F0B8012BD5E3100A8CF3F /* QuartzCore.framework */,
- 07CCF9E811E41E850054483C /* Sparkle.framework */,
- 07BB53DB118655F10045663F /* ZeroKit.framework */,
+ 2D65407A1475ECCA000133CA /* Sparkle.framework */,
+ 2D65407E1475ECF1000133CA /* ZeroKit.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
@@ -391,6 +398,14 @@
name = Products;
sourceTree = "<group>";
};
+ 2D65406B1475EAE1000133CA /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 2D6540721475EAE1000133CA /* ZeroKit.framework */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
32DBCFA10370C40200C91783 /* Other Sources */ = {
isa = PBXGroup;
children = (
@@ -464,6 +479,12 @@
);
mainGroup = 089C166AFE841209C02AAC07 /* Spectacle */;
projectDirPath = "";
+ projectReferences = (
+ {
+ ProductGroup = 2D65406B1475EAE1000133CA /* Products */;
+ ProjectRef = 2D65406A1475EAE1000133CA /* ZeroKit.xcodeproj */;
+ },
+ );
projectRoot = "";
targets = (
8D202CE80486D31800D8A456 /* Spectacle */,
@@ -472,6 +493,16 @@
};
/* End PBXProject section */
+/* Begin PBXReferenceProxy section */
+ 2D6540721475EAE1000133CA /* ZeroKit.framework */ = {
+ isa = PBXReferenceProxy;
+ fileType = wrapper.framework;
+ path = ZeroKit.framework;
+ remoteRef = 2D6540711475EAE1000133CA /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+/* End PBXReferenceProxy section */
+
/* Begin PBXResourcesBuildPhase section */
077938B21184F96A0013BC14 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -610,6 +641,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 0779390C1184FBC00013BC14 /* SpectacleHelperDevelopment.xcconfig */;
buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../../../Library/Developer/Xcode/DerivedData/Spectacle-gfuhcjgbmgbmfqaeerwhcojqjawa/Build/Products/Development\"",
+ );
VERSION_INFO_FILE = "";
};
name = Development;
@@ -618,6 +653,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 0779390D1184FBC00013BC14 /* SpectacleHelperRelease.xcconfig */;
buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../../../Library/Developer/Xcode/DerivedData/Spectacle-gfuhcjgbmgbmfqaeerwhcojqjawa/Build/Products/Development\"",
+ );
VERSION_INFO_FILE = "";
};
name = Release;
@@ -626,6 +665,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 0747DAFB1183AC5100F75DD2 /* SpectacleDevelopment.xcconfig */;
buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../../../Library/Developer/Xcode/DerivedData/Spectacle-gfuhcjgbmgbmfqaeerwhcojqjawa/Build/Products/Development\"",
+ );
SDKROOT = macosx;
VERSION_INFO_FILE = "";
};
@@ -635,6 +678,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 0747DAFC1183AC5100F75DD2 /* SpectacleRelease.xcconfig */;
buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../../../Library/Developer/Xcode/DerivedData/Spectacle-gfuhcjgbmgbmfqaeerwhcojqjawa/Build/Products/Development\"",
+ );
SDKROOT = macosx;
VERSION_INFO_FILE = "";
};

0 comments on commit 133a559

Please sign in to comment.
Something went wrong with that request. Please try again.