Skip to content

Commit

Permalink
Horrible hack to properly parse libs and frameworks on when these use…
Browse files Browse the repository at this point in the history
… macos instead of osx
  • Loading branch information
roymacdonald committed Sep 24, 2024
1 parent 7113d7c commit e0860d1
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions commandLine/src/addons/ofAddon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -720,11 +720,29 @@ void ofAddon::parseLibsPath(const fs::path & libsPath, const fs::path & parentFo
return;
}

getLibsRecursively(libsPath, libFiles, libs, platform);
if (platform == "osx" ||

if (platform == "osx" || platform == "macos"){
// Horrible hack to make it work with the bad idea of renaming osx to macos
getLibsRecursively(libsPath, libFiles, libs, "macos");
getLibsRecursively(libsPath, libFiles, libs, "osx");

getFrameworksRecursively(libsPath, frameworks, "macos");
getFrameworksRecursively(libsPath, frameworks, "osx");
getXCFrameworksRecursively(libsPath, xcframeworks, "macos");
getXCFrameworksRecursively(libsPath, xcframeworks, "osx");



}else{

getLibsRecursively(libsPath, libFiles, libs, platform);
}

if (//platform == "osx" ||
platform == "ios" ||
platform == "tvos" ||
platform == "macos"){
platform == "tvos"){//} ||
//platform == "macos"){

getFrameworksRecursively(libsPath, frameworks, platform);
getXCFrameworksRecursively(libsPath, xcframeworks, platform);
}
Expand Down

0 comments on commit e0860d1

Please sign in to comment.