Skip to content

Commit 9783559

Browse files
authored
link xcframeworks like regular libs, avoids libs being copied to bin/ closes #614 (#618)
1 parent ad9a4d5 commit 9783559

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

commandLine/src/addons/ofAddon.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ void ofAddon::getFrameworksRecursively(const fs::path & path, string platform) {
3333
frameworks.emplace_back(f.string());
3434
}
3535
if (f.extension() == ".xcframework") {
36+
if( platform != "macos" && platform != "osx" ){ //we don't want to add xcFrameworks for osx and just treat them like lib folders
3637
xcframeworks.emplace_back(f.string());
38+
}
3739
}
3840
}
3941
}

commandLine/src/utils/Utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ void getLibsRecursively(const fs::path & path, std::vector < fs::path > & libFil
341341

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

0 commit comments

Comments
 (0)