Skip to content

Commit

Permalink
dont remove comments from the addons in addons.make file
Browse files Browse the repository at this point in the history
  • Loading branch information
roymacdonald committed Sep 25, 2024
1 parent b22c01c commit 87c6fe6
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions commandLine/src/projects/baseProject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ bool baseProject::save(){
saveConfig << str << std::endl;
}
}
saveAddonsToJson();
return saveProjectFile();
}

Expand Down Expand Up @@ -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) {
Expand All @@ -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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 87c6fe6

Please sign in to comment.