Skip to content

Commit

Permalink
ignores comments in addons.make after an addon,
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasgeissl authored and arturoc committed Dec 20, 2018
1 parent 31a0b6f commit c8ddfe8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
Binary file modified frontend/app/projectGenerator
Binary file not shown.
7 changes: 6 additions & 1 deletion frontend/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,12 @@ ipc.on('isOFProjectFolder', function(event, project) {
}
});

//console.log(projectAddons);
// remove comments
projectAddons.forEach(function(element, index) {
this[index] = this[index].split('#')[0];
}, projectAddons);

// console.log('addons', projectAddons);

event.sender.send('selectAddons', projectAddons);
} else {
Expand Down
2 changes: 1 addition & 1 deletion ofxProjectGenerator/src/projects/baseProject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void baseProject::parseAddons(){
auto addon = ofTrim(line);
if(addon[0] == '#') continue;
if(addon == "") continue;
addAddon(addon);
addAddon(ofSplitString(addon, "#")[0]);
}
}

Expand Down

0 comments on commit c8ddfe8

Please sign in to comment.