Skip to content

Commit 0e6823f

Browse files
authored
Merge pull request #90 from HalfdanJ/addon_dependencies
Add addon dependencies
2 parents 34cc9f7 + 062c811 commit 0e6823f

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

ofxProjectGenerator/src/projects/baseProject.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@ void baseProject::addAddon(ofAddon & addon){
298298
for(int i=0;i<(int)addons.size();i++){
299299
if(addons[i].name==addon.name) return;
300300
}
301+
302+
for(int i=0;i<addon.dependencies.size();i++){
303+
addAddon(addon.dependencies[i]);
304+
}
301305

302306
addons.push_back(addon);
303307

ofxProjectGenerator/src/projects/visualStudioProject.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,10 @@ void visualStudioProject::addAddon(ofAddon & addon){
393393
if(addons[i].name==addon.name) return;
394394
}
395395

396+
for(int i=0;i<addon.dependencies.size();i++){
397+
baseProject::addAddon(addon.dependencies[i]);
398+
}
399+
396400
addons.push_back(addon);
397401

398402
for(int i=0;i<(int)addon.includePaths.size();i++){

ofxProjectGenerator/src/projects/xcodeProject.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,10 @@ void xcodeProject::addAddon(ofAddon & addon){
12241224
if(addons[i].name==addon.name) return;
12251225
}
12261226

1227+
for(int i=0;i<addon.dependencies.size();i++){
1228+
baseProject::addAddon(addon.dependencies[i]);
1229+
}
1230+
12271231
addons.push_back(addon);
12281232

12291233
for(int i=0;i<(int)addon.includePaths.size();i++){

0 commit comments

Comments
 (0)