Browse Source

Projucer: Fixed a bug in the Xcode exporter where Xcode resource files were being added to both the source and resource groups

tags/2021-05-28
ed 7 years ago
parent
commit
0cfa1e4b7a
1 changed files with 15 additions and 3 deletions
  1. +15
    -3
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h

+ 15
- 3
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h View File

@@ -1845,8 +1845,15 @@ private:
topLevelGroupIDs.add (addEntitlementsFile (entitlements));
for (auto& group : getAllGroups())
{
if (group.getNumChildren() > 0)
topLevelGroupIDs.add (addProjectItem (group));
{
auto groupID = addProjectItem (group);
if (groupID.isNotEmpty())
topLevelGroupIDs.add (groupID);
}
}
}
void addExtraGroupsToProject (StringArray& topLevelGroupIDs) const
@@ -2669,12 +2676,17 @@ private:
StringArray childIDs;
for (int i = 0; i < projectItem.getNumChildren(); ++i)
{
auto childID = addProjectItem (projectItem.getChild(i));
auto child = projectItem.getChild (i);
auto childID = addProjectItem (child);
if (childID.isNotEmpty())
if (childID.isNotEmpty() && ! child.shouldBeAddedToXcodeResources())
childIDs.add (childID);
}
if (childIDs.isEmpty())
return {};
return addGroup (projectItem, childIDs);
}


Loading…
Cancel
Save