Skip to content

Commit 746e7ed

Browse files
authored
Switch to carthage --use-xcframeworks (#54)
1 parent eff24ea commit 746e7ed

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/objective-c-xcode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
5151
- name: Carthage Dependencies
5252
run: |
53-
carthage update --platform mac
53+
carthage bootstrap --use-xcframeworks --platform mac
5454
5555
- name: Build
5656
run: |

CoreZen.xcodeproj/project.pbxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@
635635
535FA7942CA44B16003481B6 /* render.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = render.h; sourceTree = "<group>"; };
636636
535FA7952CA44B16003481B6 /* render_gl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = render_gl.h; sourceTree = "<group>"; };
637637
535FA7962CA44B16003481B6 /* stream_cb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stream_cb.h; sourceTree = "<group>"; };
638-
538499102885FF21004ED6A1 /* FMDB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FMDB.framework; path = Carthage/Build/Mac/FMDB.framework; sourceTree = "<group>"; };
638+
538499102885FF21004ED6A1 /* FMDB.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FMDB.xcframework; path = Carthage/Build/FMDB.xcframework; sourceTree = "<group>"; };
639639
5386706928BFE16300FB15EB /* MediaPlayerControlsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaPlayerControlsView.m; sourceTree = "<group>"; };
640640
5386706B28BFE16300FB15EB /* MediaPlayerControlsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerControlsView.h; sourceTree = "<group>"; };
641641
538E05012885DCED00CE9DE7 /* DomainObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DomainObject.h; sourceTree = "<group>"; };
@@ -666,7 +666,7 @@
666666
isa = PBXFrameworksBuildPhase;
667667
buildActionMask = 2147483647;
668668
files = (
669-
538499112885FF21004ED6A1 /* FMDB.framework in Frameworks */,
669+
538499112885FF21004ED6A1 /* FMDB.xcframework in Frameworks */,
670670
535FA8292CA44C11003481B6 /* libavformat.61.dylib in Frameworks */,
671671
535FA82A2CA44C2A003481B6 /* libavutil.59.dylib in Frameworks */,
672672
535FA82B2CA44C39003481B6 /* libavcodec.61.dylib in Frameworks */,
@@ -799,7 +799,7 @@
799799
5309C4162885C9A800BC0AAE /* Frameworks */ = {
800800
isa = PBXGroup;
801801
children = (
802-
538499102885FF21004ED6A1 /* FMDB.framework */,
802+
538499102885FF21004ED6A1 /* FMDB.xcframework */,
803803
);
804804
name = Frameworks;
805805
sourceTree = "<group>";
@@ -1623,7 +1623,7 @@
16231623
DYLIB_INSTALL_NAME_BASE = "@rpath";
16241624
FRAMEWORK_SEARCH_PATHS = (
16251625
"$(inherited)",
1626-
"$(PROJECT_DIR)/Carthage/Build/Mac",
1626+
"$(PROJECT_DIR)/Carthage/Build",
16271627
);
16281628
GCC_PREPROCESSOR_DEFINITIONS = GL_SILENCE_DEPRECATION;
16291629
GENERATE_INFOPLIST_FILE = YES;
@@ -1662,7 +1662,7 @@
16621662
DYLIB_INSTALL_NAME_BASE = "@rpath";
16631663
FRAMEWORK_SEARCH_PATHS = (
16641664
"$(inherited)",
1665-
"$(PROJECT_DIR)/Carthage/Build/Mac",
1665+
"$(PROJECT_DIR)/Carthage/Build",
16661666
);
16671667
GCC_PREPROCESSOR_DEFINITIONS = GL_SILENCE_DEPRECATION;
16681668
GENERATE_INFOPLIST_FILE = YES;
@@ -1695,7 +1695,7 @@
16951695
DEVELOPMENT_TEAM = 5N7Y5W34VF;
16961696
FRAMEWORK_SEARCH_PATHS = (
16971697
"$(inherited)",
1698-
"$(PROJECT_DIR)/Carthage/Build/Mac",
1698+
"$(PROJECT_DIR)/Carthage/Build",
16991699
);
17001700
GENERATE_INFOPLIST_FILE = YES;
17011701
MACOSX_DEPLOYMENT_TARGET = 13.0;
@@ -1717,7 +1717,7 @@
17171717
DEVELOPMENT_TEAM = 5N7Y5W34VF;
17181718
FRAMEWORK_SEARCH_PATHS = (
17191719
"$(inherited)",
1720-
"$(PROJECT_DIR)/Carthage/Build/Mac",
1720+
"$(PROJECT_DIR)/Carthage/Build",
17211721
);
17221722
GENERATE_INFOPLIST_FILE = YES;
17231723
MACOSX_DEPLOYMENT_TARGET = 13.0;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Written by [Zach Nelson](https://github.com/znelson). See the [LICENSE file](htt
1111
### FMDB.framework Dependency
1212
`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).
1313

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

1616
### mpv and libav Dependencies
1717
`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).

0 commit comments

Comments
 (0)