From e0860d1e05ac9df4f7aaa519d71181ff668d3930 Mon Sep 17 00:00:00 2001 From: Roy Macdonald Date: Tue, 24 Sep 2024 17:51:24 -0300 Subject: [PATCH] Horrible hack to properly parse libs and frameworks on when these use macos instead of osx --- commandLine/src/addons/ofAddon.cpp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/commandLine/src/addons/ofAddon.cpp b/commandLine/src/addons/ofAddon.cpp index 67b593f5..6834d808 100644 --- a/commandLine/src/addons/ofAddon.cpp +++ b/commandLine/src/addons/ofAddon.cpp @@ -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); }