diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj index 2306030..62ccf42 100644 --- a/Persephone.xcodeproj/project.pbxproj +++ b/Persephone.xcodeproj/project.pbxproj @@ -13,6 +13,8 @@ E40786232110CE70006887B1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E40786212110CE70006887B1 /* Main.storyboard */; }; E407862F2110CE70006887B1 /* PersephoneTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E407862E2110CE70006887B1 /* PersephoneTests.swift */; }; E407863A2110CE70006887B1 /* PersephoneUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40786392110CE70006887B1 /* PersephoneUITests.swift */; }; + E41B22C021FB6BBA00D544F6 /* libmpdclient.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E41B22BF21FB6BBA00D544F6 /* libmpdclient.2.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + E41B22C121FB6C3300D544F6 /* libmpdclient.2.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = E41B22BF21FB6BBA00D544F6 /* libmpdclient.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; E465049A21E94DF500A70F4C /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465049921E94DF500A70F4C /* WindowController.swift */; }; /* End PBXBuildFile section */ @@ -33,6 +35,20 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + E41B22C221FB6C3300D544F6 /* Embed Libraries */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + E41B22C121FB6C3300D544F6 /* libmpdclient.2.dylib in Embed Libraries */, + ); + name = "Embed Libraries"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ E40786182110CE6E006887B1 /* Persephone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Persephone.app; sourceTree = BUILT_PRODUCTS_DIR; }; E407861B2110CE6E006887B1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -47,6 +63,8 @@ E40786352110CE70006887B1 /* PersephoneUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PersephoneUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E40786392110CE70006887B1 /* PersephoneUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersephoneUITests.swift; sourceTree = ""; }; E407863B2110CE70006887B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E41B22BF21FB6BBA00D544F6 /* libmpdclient.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmpdclient.2.dylib; path = libmpdclient/output/libmpdclient.2.dylib; sourceTree = ""; }; + E41B22C321FB6EFA00D544F6 /* Persephone-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Persephone-Bridging-Header.h"; sourceTree = ""; }; E465049921E94DF500A70F4C /* WindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -55,6 +73,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E41B22C021FB6BBA00D544F6 /* libmpdclient.2.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -82,6 +101,7 @@ E407862D2110CE70006887B1 /* PersephoneTests */, E40786382110CE70006887B1 /* PersephoneUITests */, E40786192110CE6E006887B1 /* Products */, + E41B22BE21FB6B3300D544F6 /* Frameworks */, ); sourceTree = ""; }; @@ -103,6 +123,7 @@ E407861F2110CE70006887B1 /* Assets.xcassets */, E40786212110CE70006887B1 /* Main.storyboard */, E465049921E94DF500A70F4C /* WindowController.swift */, + E41B22C321FB6EFA00D544F6 /* Persephone-Bridging-Header.h */, E40786242110CE70006887B1 /* Info.plist */, E40786252110CE70006887B1 /* Persephone.entitlements */, ); @@ -127,6 +148,14 @@ path = PersephoneUITests; sourceTree = ""; }; + E41B22BE21FB6B3300D544F6 /* Frameworks */ = { + isa = PBXGroup; + children = ( + E41B22BF21FB6BBA00D544F6 /* libmpdclient.2.dylib */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -137,6 +166,7 @@ E40786142110CE6E006887B1 /* Sources */, E40786152110CE6E006887B1 /* Frameworks */, E40786162110CE6E006887B1 /* Resources */, + E41B22C221FB6C3300D544F6 /* Embed Libraries */, ); buildRules = ( ); @@ -427,14 +457,21 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = BDEE7ZBFZ3; + HEADER_SEARCH_PATHS = libmpdclient/include; INFOPLIST_FILE = Persephone/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/libmpdclient/output", + ); PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Persephone/Persephone-Bridging-Header.h"; SWIFT_VERSION = 4.0; + USER_HEADER_SEARCH_PATHS = libmpdclient/output; }; name = Debug; }; @@ -446,14 +483,21 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = BDEE7ZBFZ3; + HEADER_SEARCH_PATHS = libmpdclient/include; INFOPLIST_FILE = Persephone/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/libmpdclient/output", + ); PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Persephone/Persephone-Bridging-Header.h"; SWIFT_VERSION = 4.0; + USER_HEADER_SEARCH_PATHS = libmpdclient/output; }; name = Release; }; diff --git a/Persephone/Persephone-Bridging-Header.h b/Persephone/Persephone-Bridging-Header.h new file mode 100644 index 0000000..a315cce --- /dev/null +++ b/Persephone/Persephone-Bridging-Header.h @@ -0,0 +1 @@ +#import