Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/objective-c-xcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

- name: Carthage Dependencies
run: |
carthage update --platform mac
carthage bootstrap --use-xcframeworks --platform mac

- name: Build
run: |
Expand Down
14 changes: 7 additions & 7 deletions CoreZen.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@
535FA7942CA44B16003481B6 /* render.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = render.h; sourceTree = "<group>"; };
535FA7952CA44B16003481B6 /* render_gl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = render_gl.h; sourceTree = "<group>"; };
535FA7962CA44B16003481B6 /* stream_cb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stream_cb.h; sourceTree = "<group>"; };
538499102885FF21004ED6A1 /* FMDB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FMDB.framework; path = Carthage/Build/Mac/FMDB.framework; sourceTree = "<group>"; };
538499102885FF21004ED6A1 /* FMDB.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FMDB.xcframework; path = Carthage/Build/FMDB.xcframework; sourceTree = "<group>"; };
5386706928BFE16300FB15EB /* MediaPlayerControlsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaPlayerControlsView.m; sourceTree = "<group>"; };
5386706B28BFE16300FB15EB /* MediaPlayerControlsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerControlsView.h; sourceTree = "<group>"; };
538E05012885DCED00CE9DE7 /* DomainObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DomainObject.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -666,7 +666,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
538499112885FF21004ED6A1 /* FMDB.framework in Frameworks */,
538499112885FF21004ED6A1 /* FMDB.xcframework in Frameworks */,
535FA8292CA44C11003481B6 /* libavformat.61.dylib in Frameworks */,
535FA82A2CA44C2A003481B6 /* libavutil.59.dylib in Frameworks */,
535FA82B2CA44C39003481B6 /* libavcodec.61.dylib in Frameworks */,
Expand Down Expand Up @@ -799,7 +799,7 @@
5309C4162885C9A800BC0AAE /* Frameworks */ = {
isa = PBXGroup;
children = (
538499102885FF21004ED6A1 /* FMDB.framework */,
538499102885FF21004ED6A1 /* FMDB.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -1623,7 +1623,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
"$(PROJECT_DIR)/Carthage/Build",
);
GCC_PREPROCESSOR_DEFINITIONS = GL_SILENCE_DEPRECATION;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -1662,7 +1662,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
"$(PROJECT_DIR)/Carthage/Build",
);
GCC_PREPROCESSOR_DEFINITIONS = GL_SILENCE_DEPRECATION;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -1695,7 +1695,7 @@
DEVELOPMENT_TEAM = 5N7Y5W34VF;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
"$(PROJECT_DIR)/Carthage/Build",
);
GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0;
Expand All @@ -1717,7 +1717,7 @@
DEVELOPMENT_TEAM = 5N7Y5W34VF;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
"$(PROJECT_DIR)/Carthage/Build",
);
GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Written by [Zach Nelson](https://github.com/znelson). See the [LICENSE file](htt
### FMDB.framework Dependency
`CoreZen` links against and bundles [FMDB.framework](https://github.com/ccgus/fmdb). The Xcode project is set up to find FMDB installed using [Carthage](https://github.com/Carthage/Carthage#quick-start).

_**Installation:**_ Run `carthage update --platform mac` to build Carthage/Build/Mac/FMDB.framework. The `CoreZen` Xcode project will find it from there.
_**Installation:**_ Run `carthage bootstrap --use-xcframeworks --platform mac` to build Carthage/Build/FMDB.xcframework. The `CoreZen` Xcode project will find it from there.

### mpv and libav Dependencies
`CoreZen` links against and bundles dynamic libraries for [libmpv](https://github.com/mpv-player/mpv/blob/master/DOCS/man/libmpv.rst) and [libav](https://github.com/libav/libav#readme). The Xcode project is set up to find headers and libraries installed using [Homebrew](https://brew.sh).
Expand Down
Loading