mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-19 01:04:20 +00:00
Code Activity

Introjucer: images files that aren't marked as being a binary include are added to the Xcode project as resources.

Browse source
This commit is contained in:
jules 2012-10-02 12:57:40 +01:00
parent 69e885dcd4
commit c38cb0a7b9
5 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
View file

@ -37,6 +37,7 @@
C9F11BA62D6D092A300363F7 = { isa = PBXBuildFile; fileRef = 0F249640243FBD5717F6ADD9; };
F6635694A01FFBF5EF0968DB = { isa = PBXBuildFile; fileRef = 631983AA62673015F8D7453B; };
FCE6F604C00039A32649CB69 = { isa = PBXBuildFile; fileRef = 2E680E2C65684A4272AE079A; };
6FC19EBA7A51423C3D22F77B = { isa = PBXBuildFile; fileRef = B483D960309FAFC193F9CDA2; };
3C5267E06A897B0DC0F7EA50 = { isa = PBXBuildFile; fileRef = 472F9A90F685220D730EBF6C; };
7E72CB84146E1B4B168356CA = { isa = PBXBuildFile; fileRef = 38F29C2049566C47993A6D92; };
24AE6B973834AF7E0DE1F228 = { isa = PBXBuildFile; fileRef = D53B54D1786A1FFC024BF064; };
@ -1616,7 +1617,8 @@
364D1A9B113320407A7E57B9 ); name = "Juce Library Code"; sourceTree = "<group>"; };
8180B5894A78501084B8F133 = { isa = PBXGroup; children = (
4CA1C3E6585D7694AA9C309F,
951128CA33CCDEF570436B1C ); name = Resources; sourceTree = "<group>"; };
951128CA33CCDEF570436B1C,
B483D960309FAFC193F9CDA2 ); name = Resources; sourceTree = "<group>"; };
0FFEF043CA89142B18C79ABE = { isa = PBXGroup; children = (
D00F311BFC3C2625C457CB9B,
D1F9B0E9F5D54FE48BEB46EA,
@ -1704,7 +1706,8 @@
EA0BCC969703B2D179089E55,
B159CF4275B8A90122629FF4 ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
C009859650B4628FDD068941 = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = (
1321E6C1C6170B6C898AD09D ); runOnlyForDeploymentPostprocessing = 0; };
1321E6C1C6170B6C898AD09D,
6FC19EBA7A51423C3D22F77B ); runOnlyForDeploymentPostprocessing = 0; };
84449D044096A03F2582904B = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
357A6AA6960EF95D92929BEE,
954A036F5DDB375DB23FFB3E,

30
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h
View file

@ -971,7 +971,7 @@ private:
return "file" + file.getFileExtension();
}
String addFile (const RelativePath& path, bool shouldBeCompiled, bool inhibitWarnings) const
String addFile (const RelativePath& path, bool shouldBeCompiled, bool shouldBeAddedToBinaryResources, bool inhibitWarnings) const
{
const String pathAsString (path.toUnixStyle());
const String refID (addFileReference (path.toUnixStyle()));
@ -983,6 +983,16 @@ private:
else
addBuildFile (pathAsString, refID, true, inhibitWarnings);
}
else if (! shouldBeAddedToBinaryResources)
{
const String fileType (getFileType (path));
if (fileType.startsWith ("image.") || fileType.startsWith ("text.") || fileType.startsWith ("file."))
{
resourceIDs.add (addBuildFile (pathAsString, refID, false, false));
resourceFileRefs.add (refID);
}
}
return refID;
}
@ -1006,19 +1016,17 @@ private:
{
if (projectItem.shouldBeAddedToTargetProject())
{
String itemPath (projectItem.getFilePath());
bool inhibitWarnings = projectItem.shouldInhibitWarnings();
const String itemPath (projectItem.getFilePath());
RelativePath path;
if (itemPath.startsWith ("${"))
{
const RelativePath path (itemPath, RelativePath::unknown);
return addFile (path, projectItem.shouldBeCompiled(), inhibitWarnings);
}
path = RelativePath (itemPath, RelativePath::unknown);
else
{
const RelativePath path (projectItem.getFile(), getTargetFolder(), RelativePath::buildTargetFolder);
return addFile (path, projectItem.shouldBeCompiled(), inhibitWarnings);
}
path = RelativePath (projectItem.getFile(), getTargetFolder(), RelativePath::buildTargetFolder);
return addFile (path, projectItem.shouldBeCompiled(),
projectItem.shouldBeAddedToBinaryResources(),
projectItem.shouldInhibitWarnings());
}
}

7
extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj
View file

@ -41,6 +41,7 @@
85EB509411E79E3F970C9653 = { isa = PBXBuildFile; fileRef = BD69603F635BE80BC99C7865; };
C24BF8E3142DBFD0139EFEE9 = { isa = PBXBuildFile; fileRef = C87942E350F974B22047D457; };
BEBB1C4BA92F6D4CDE224A15 = { isa = PBXBuildFile; fileRef = 6649385F220EB0B654AB61FB; };
FF850BBBDE1F9ADA6DF8C297 = { isa = PBXBuildFile; fileRef = A8F2E649E566EDE8D4C42F21; };
662202A6B86B11E3DBD96D58 = { isa = PBXBuildFile; fileRef = 579D22DA6ECC930E19B7104A; };
B00C72D607AF2A98366B40DE = { isa = PBXBuildFile; fileRef = 33DAC2BB94AFCF8EB33A1417; };
8938D948E7A216EE7264F500 = { isa = PBXBuildFile; fileRef = 7C7834D5AB7E6656A4CECF2F; };
@ -1996,7 +1997,8 @@
42B89D48E9FB252F1BC3796A ); name = "Juce Library Code"; sourceTree = "<group>"; };
539DF80B9269EFCA8BF42818 = { isa = PBXGroup; children = (
148C8FE6639F6CDF0E92235D,
16793951B75EADE5C08FD129 ); name = Resources; sourceTree = "<group>"; };
16793951B75EADE5C08FD129,
A8F2E649E566EDE8D4C42F21 ); name = Resources; sourceTree = "<group>"; };
0AE68D12A51E59B084E046C1 = { isa = PBXGroup; children = (
DEB23C98FEC261260F63B6A4,
4E1E8D79739D5A1771F1CE96,
@ -2093,7 +2095,8 @@
2FE1E46B92ED7BD427F01D8C,
9E3B64077ABD2AA72A51EE7C ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
2E115993E9743E9E60D96434 = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = (
933C39A0A20A89B767742D07 ); runOnlyForDeploymentPostprocessing = 0; };
933C39A0A20A89B767742D07,
FF850BBBDE1F9ADA6DF8C297 ); runOnlyForDeploymentPostprocessing = 0; };
8478974C956501F4EA996448 = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
F7DF6AC4276AD42F4F360E37,
B99620051F4C5A2FAB1DE49C,

7
extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj
View file

@ -37,6 +37,7 @@
85EB509411E79E3F970C9653 = { isa = PBXBuildFile; fileRef = BD69603F635BE80BC99C7865; };
C24BF8E3142DBFD0139EFEE9 = { isa = PBXBuildFile; fileRef = C87942E350F974B22047D457; };
BEBB1C4BA92F6D4CDE224A15 = { isa = PBXBuildFile; fileRef = 6649385F220EB0B654AB61FB; };
FF850BBBDE1F9ADA6DF8C297 = { isa = PBXBuildFile; fileRef = A8F2E649E566EDE8D4C42F21; };
662202A6B86B11E3DBD96D58 = { isa = PBXBuildFile; fileRef = 579D22DA6ECC930E19B7104A; };
B00C72D607AF2A98366B40DE = { isa = PBXBuildFile; fileRef = 33DAC2BB94AFCF8EB33A1417; };
8938D948E7A216EE7264F500 = { isa = PBXBuildFile; fileRef = 7C7834D5AB7E6656A4CECF2F; };
@ -1988,7 +1989,8 @@
42B89D48E9FB252F1BC3796A ); name = "Juce Library Code"; sourceTree = "<group>"; };
539DF80B9269EFCA8BF42818 = { isa = PBXGroup; children = (
148C8FE6639F6CDF0E92235D,
16793951B75EADE5C08FD129 ); name = Resources; sourceTree = "<group>"; };
16793951B75EADE5C08FD129,
A8F2E649E566EDE8D4C42F21 ); name = Resources; sourceTree = "<group>"; };
0AE68D12A51E59B084E046C1 = { isa = PBXGroup; children = (
DEB23C98FEC261260F63B6A4,
EE3E9902579904E57D1A5A18,
@ -2082,7 +2084,8 @@
2FE1E46B92ED7BD427F01D8C,
9E3B64077ABD2AA72A51EE7C ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
2E115993E9743E9E60D96434 = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = (
933C39A0A20A89B767742D07 ); runOnlyForDeploymentPostprocessing = 0; };
933C39A0A20A89B767742D07,
FF850BBBDE1F9ADA6DF8C297 ); runOnlyForDeploymentPostprocessing = 0; };
8478974C956501F4EA996448 = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
F7DF6AC4276AD42F4F360E37,
B99620051F4C5A2FAB1DE49C,

7
extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj
View file

@ -42,6 +42,7 @@
9FC923316A5ACB62749289D5 = { isa = PBXBuildFile; fileRef = 055A8501648EC9E173708E7F; };
6F1387E743E59FBB7E00DF03 = { isa = PBXBuildFile; fileRef = A69DAE468414B98E595F6260; };
D1FCEA3F06BB66BE06813FDB = { isa = PBXBuildFile; fileRef = B94ABB13A3A446637A56055E; };
3F8D676A427504E43DFBBCA7 = { isa = PBXBuildFile; fileRef = 2CCAAE22C308769866A5A9FD; };
02F6664CCB98B84B509BEC71 = { isa = PBXBuildFile; fileRef = B665F814FB6BEFA5FBC7FC0D; };
5EEA29250EDDF75FAABDFA99 = { isa = PBXBuildFile; fileRef = 4D5AE0F55C03F1A2EFFA74BA; };
80061ACF8A15E196E095BAAE = { isa = PBXBuildFile; fileRef = 7216D4A305303A9016403385; };
@ -1641,7 +1642,8 @@
BCCA9224BBA2DC97107B3304 ); name = "Juce Library Code"; sourceTree = "<group>"; };
35E78DF3B882743C2D418E5B = { isa = PBXGroup; children = (
F2E48F527D479CFD9A23F54A,
292D265400A63B191B93428C ); name = Resources; sourceTree = "<group>"; };
292D265400A63B191B93428C,
2CCAAE22C308769866A5A9FD ); name = Resources; sourceTree = "<group>"; };
680BC5D164A7D17AAD7A2932 = { isa = PBXGroup; children = (
9787BBA62FFDE7CC54A3E05E,
52554FCDDCC81D87EBE5CD22,
@ -1727,7 +1729,8 @@
C4428643C14DD60BA895A378,
EB7F74BF01346F8C6BCC31A7 ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
C06AC70106231834669512C5 = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = (
E0DA84A74FBC8FEA743CEC28 ); runOnlyForDeploymentPostprocessing = 0; };
E0DA84A74FBC8FEA743CEC28,
3F8D676A427504E43DFBBCA7 ); runOnlyForDeploymentPostprocessing = 0; };
394C2D5A71955036D265B490 = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
478ABAE2C6404C2175CAEFDD,
DE359ADFBA6E13CD4938EE7D,