From 87c6fe62b2d543be2c43431484fbd47f9e7439d1 Mon Sep 17 00:00:00 2001 From: Roy Macdonald Date: Wed, 25 Sep 2024 19:50:44 -0300 Subject: [PATCH] dont remove comments from the addons in addons.make file --- commandLine/src/projects/baseProject.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/commandLine/src/projects/baseProject.cpp b/commandLine/src/projects/baseProject.cpp index 074aed61..b7372a32 100644 --- a/commandLine/src/projects/baseProject.cpp +++ b/commandLine/src/projects/baseProject.cpp @@ -293,6 +293,7 @@ bool baseProject::save(){ saveConfig << str << std::endl; } } + saveAddonsToJson(); return saveProjectFile(); } @@ -541,7 +542,7 @@ void baseProject::addAddon(ofAddon & addon){ unless there is one addon added which needs another, and it needs another. */ - alert("---> dependencies"); +// alert("---> dependencies"); for (auto & d : addon.dependencies) { bool found = false; for (auto & a : addons) { @@ -557,7 +558,7 @@ void baseProject::addAddon(ofAddon & addon){ ofLogVerbose() << "trying to add duplicated addon dependency! skipping: " << d; } } - alert("---> dependencies"); +// alert("---> dependencies"); addons.emplace_back(addon); ofLogVerbose("baseProject") << "libs in addAddon " << addon.libs.size(); @@ -687,7 +688,6 @@ void baseProject::addAddonObjcsrcFiles(const ofAddon& addon){ void baseProject::addAddonHeadersrcFiles(const ofAddon& addon){ for (auto & a : addon.headersrcFiles) { - fs::path normalizedDir = makeRelative(getOFRoot(), a); ofLogVerbose("baseProject") << "adding addon header srcFiles: [" << normalizedDir.string() << "]"; addSrc(normalizedDir, addon.filesToFolders.at(a),HEADER); @@ -746,8 +746,10 @@ void baseProject::parseAddons(){ // alert("line " + addon); if(addon[0] == '#') continue; if(addon == "") continue; - auto s = ofSplitString(addon, "#")[0]; - addAddon(ofSplitString(addon, "#")[0]); +// auto s = ofSplitString(addon, "#")[0]; +// addAddon(ofSplitString(addon, "#")[0]); + //we want to keep the comments in the addons.make file since those are use in the package manage + addAddon(addon); } }