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: 2 additions & 0 deletions commandLine/src/addons/ofAddon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ void ofAddon::getFrameworksRecursively(const fs::path & path, string platform) {
frameworks.emplace_back(f.string());
}
if (f.extension() == ".xcframework") {
if( platform != "macos" && platform != "osx" ){ //we don't want to add xcFrameworks for osx and just treat them like lib folders
xcframeworks.emplace_back(f.string());
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion commandLine/src/utils/Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void getLibsRecursively(const fs::path & path, std::vector < fs::path > & libFil

if (fs::is_directory(f)) {
// on osx, framework is a directory, let's not parse it....
if ((f.extension() == ".framework") || (f.extension() == ".xcframework")) {
if ((f.extension() == ".framework") || (f.extension() == ".xcframework" && (platform != "osx" && platform != "macos")) ) { //we want to treat .xcframeworks as regular libs for macos
it.disable_recursion_pending();
continue;
}
Expand Down