From e85d3aaf1f584fb4324265ea9c9a0363c699868f Mon Sep 17 00:00:00 2001 From: tpoole Date: Fri, 6 Oct 2017 09:54:32 +0100 Subject: [PATCH] Renamed XCode to Xcode in multiple places --- .../pages/juce_the_standalone_blocks_sdk.dox | 6 +- extras/BLOCKS/standalone_sdk/README.md | 6 +- .../MacOSX/Projucer.xcodeproj/project.pbxproj | 2 +- .../VisualStudio2013/Projucer_App.vcxproj | 2 +- .../Projucer_App.vcxproj.filters | 2 +- .../VisualStudio2015/Projucer_App.vcxproj | 2 +- .../Projucer_App.vcxproj.filters | 2 +- .../VisualStudio2017/Projucer_App.vcxproj | 2 +- .../Projucer_App.vcxproj.filters | 2 +- extras/Projucer/Projucer.jucer | 4 +- .../Projucer/Source/Project/jucer_Module.cpp | 4 +- ...rt_XCode.h => jucer_ProjectExport_Xcode.h} | 86 +++++++++---------- .../ProjectSaving/jucer_ProjectExporter.cpp | 26 +++--- .../juce_audio_plugin_client_RTAS.r | 2 +- .../native/juce_mac_ClangBugWorkaround.h | 2 +- 15 files changed, 75 insertions(+), 75 deletions(-) rename extras/Projucer/Source/ProjectSaving/{jucer_ProjectExport_XCode.h => jucer_ProjectExport_Xcode.h} (95%) diff --git a/extras/BLOCKS/doxygen/pages/juce_the_standalone_blocks_sdk.dox b/extras/BLOCKS/doxygen/pages/juce_the_standalone_blocks_sdk.dox index bd8a8f4322..44c6b9d69a 100644 --- a/extras/BLOCKS/doxygen/pages/juce_the_standalone_blocks_sdk.dox +++ b/extras/BLOCKS/doxygen/pages/juce_the_standalone_blocks_sdk.dox @@ -10,7 +10,7 @@ Finally, when you want to compile your application, you must link against the st @section standalone_building_library Building the SDK library The source code for the BLOCKS SDK library is contained within the SDK directory of the BLOCKS-SDK repository. -Here you will find header files that you can include in your own projects and the Build subdirectory contains an XCode project, a Visual Studio project and a Linux Makefile for compiling the SDK source code into a static library. +Here you will find header files that you can include in your own projects and the Build subdirectory contains an Xcode project, a Visual Studio project and a Linux Makefile for compiling the SDK source code into a static library. Use the appropriate choice for your platform, select either the "Debug" or "Release" configuration, and build the project. For MacOS this will produce libBLOCKS-SDK.a in either the SDK/Build/MacOS/Debug/ or SDK/Build/MacOS/Release/ directory, for Linux this will produce libBLOCKS-SDK.a in either the SDK/Build/Linux/Debug/ or SDK/Build/Linux/Release/ directory, and for Windows this will produce BLOCKS-SDK.lib in either the SDK\\Build\\Windows\\x64\\Debug or SDK\\Build\\Windows\\x64\\Release folder. @@ -18,13 +18,13 @@ For MacOS this will produce libBLOCKS-SDK.a in either the SDK/Build @section standalone_using_header Using the SDK header file To use BLOCKS classes and functions in your application you must include the BlocksHeader.h file in your source code. -You also need to tell the compiler to look in the SDK directory for additional header files, which you can configure inside your XCode or Visual Studio project. +You also need to tell the compiler to look in the SDK directory for additional header files, which you can configure inside your Xcode or Visual Studio project. If you are using the command line to compile your application then you can see an example of how to do this in examples/BLOCKS-SDK/BlockFinder/Linux/Makefile (which is also configured for MacOS, despite being located inside the Linux directory). @section standalone_linking Linking against the SDK library You must also tell your compiler where to find the SDK static library before your BLOCKS application will compile, and include all of the dependencies for your platform, which are listed in the @ref standalone_dependencies section. -Again, this is configured in your XCode or Visual Studio project, but if you are using the command line you can see an example of how to do this in examples/BLOCKS-SDK/BlockFinder/Linux/Makefile (which, again, is also configured for MacOS). +Again, this is configured in your Xcode or Visual Studio project, but if you are using the command line you can see an example of how to do this in examples/BLOCKS-SDK/BlockFinder/Linux/Makefile (which, again, is also configured for MacOS). @section standalone_example An example application diff --git a/extras/BLOCKS/standalone_sdk/README.md b/extras/BLOCKS/standalone_sdk/README.md index 92d6bd852d..30293d72e9 100644 --- a/extras/BLOCKS/standalone_sdk/README.md +++ b/extras/BLOCKS/standalone_sdk/README.md @@ -37,17 +37,17 @@ This will produce the executable `BlockFinder` in the `Debug` directory. ### Compiling the library -The source code for the BLOCKS SDK library is contained within the `SDK` directory of this repository. Here you will find header files that you can include in your own projects and the `Build` subdirectory contains an XCode project, a Visual Studio project and a Linux Makefile for compiling the SDK source code into a static library. Use the appropriate choice for your platform, select either the "Debug" or "Release" configuration, and build the project. +The source code for the BLOCKS SDK library is contained within the `SDK` directory of this repository. Here you will find header files that you can include in your own projects and the `Build` subdirectory contains an Xcode project, a Visual Studio project and a Linux Makefile for compiling the SDK source code into a static library. Use the appropriate choice for your platform, select either the "Debug" or "Release" configuration, and build the project. For MacOS this will produce `libBLOCKS-SDK.a` in either the `SDK/Build/MacOS/Debug/` or `SDK/Build/MacOS/Release/` directory, for Linux this will produce `libBLOCKS-SDK.a` in either the `SDK/Build/Linux/Debug/` or `SDK/Build/Linux/Release/` directory, and for Windows this will produce `BLOCKS-SDK.lib` in either the `SDK\Build\Windows\x64\Debug` or `SDK\Build\Windows\x64\Release` folder. ### Using the SDK header file -To use BLOCKS classes and functions in your application you must include the `BlocksHeader.h` file in your source code. You also need to tell the compiler to look in the `SDK` directory for additional header files, which you can configure inside your XCode or Visual Studio project. If you are using the command line to compile your application then you can see an example of how to do this in `examples/BLOCKS-SDK/BlockFinder/Linux/Makefile` (which is also configured for MacOS, despite being located inside the Linux directory). +To use BLOCKS classes and functions in your application you must include the `BlocksHeader.h` file in your source code. You also need to tell the compiler to look in the `SDK` directory for additional header files, which you can configure inside your Xcode or Visual Studio project. If you are using the command line to compile your application then you can see an example of how to do this in `examples/BLOCKS-SDK/BlockFinder/Linux/Makefile` (which is also configured for MacOS, despite being located inside the Linux directory). ### Linking against the SDK library -You must also tell your compiler where to find the SDK static library before your BLOCKS application will compile, and include all of the dependencies for your platform, which are listed in the Dependencies section of this README. Again, this is configured in your XCode or Visual Studio project, but if you are using the command line you can see an example of how to do this in `examples/BLOCKS-SDK/BlockFinder/Linux/Makefile` (which, again, is also configured for MacOS). +You must also tell your compiler where to find the SDK static library before your BLOCKS application will compile, and include all of the dependencies for your platform, which are listed in the Dependencies section of this README. Again, this is configured in your Xcode or Visual Studio project, but if you are using the command line you can see an example of how to do this in `examples/BLOCKS-SDK/BlockFinder/Linux/Makefile` (which, again, is also configured for MacOS). ## Dependencies diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index 91226b21c7..ecaded751f 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -129,7 +129,7 @@ 28D0199327887FFABF9C3F20 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_UserSettingsPopup.h"; path = "../../Source/Utility/UI/jucer_UserSettingsPopup.h"; sourceTree = "SOURCE_ROOT"; }; 2BD9B4556479A8A41740BCAE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentTemplate.h"; path = "../../Source/BinaryData/Templates/jucer_ComponentTemplate.h"; sourceTree = "SOURCE_ROOT"; }; 2CD34A70B4032C0426F7AA10 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_MainWindow.h"; path = "../../Source/Application/jucer_MainWindow.h"; sourceTree = "SOURCE_ROOT"; }; - 2D3715751E901915E416301D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_XCode.h"; path = "../../Source/ProjectSaving/jucer_ProjectExport_XCode.h"; sourceTree = "SOURCE_ROOT"; }; + 2D3715751E901915E416301D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_Xcode.h"; path = "../../Source/ProjectSaving/jucer_ProjectExport_Xcode.h"; sourceTree = "SOURCE_ROOT"; }; 2DF5A61F3C497537634773DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ActivityListComponent.h"; path = "../../Source/LiveBuildEngine/UI/jucer_ActivityListComponent.h"; sourceTree = "SOURCE_ROOT"; }; 2EEB1C074162F363C6599282 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_CommandLine.h"; path = "../../Source/Application/jucer_CommandLine.h"; sourceTree = "SOURCE_ROOT"; }; 2F373F97E30AC1A0BFC1FC61 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_FilePropertyComponent.h"; path = "../../Source/ComponentEditor/Properties/jucer_FilePropertyComponent.h"; sourceTree = "SOURCE_ROOT"; }; diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj index 8341a236b7..1958fe2485 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj @@ -1520,7 +1520,7 @@ - + diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters index 2fe5d3e590..d409202e57 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters @@ -2127,7 +2127,7 @@ Projucer\ProjectSaving - + Projucer\ProjectSaving diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj index 938147607a..4b85221d0e 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj @@ -1520,7 +1520,7 @@ - + diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters index 02ffbfd20e..31a2e9a3fa 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters @@ -2127,7 +2127,7 @@ Projucer\ProjectSaving - + Projucer\ProjectSaving diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index 236d325480..3376cf1de5 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -1520,7 +1520,7 @@ - + diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters index 5f7bd32640..5256aac656 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters @@ -2127,7 +2127,7 @@ Projucer\ProjectSaving - + Projucer\ProjectSaving diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index f512d25022..c89529855e 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -553,8 +553,8 @@ file="Source/ProjectSaving/jucer_ProjectExport_Make.h"/> - + (exporter); + auto& xcodeExporter = dynamic_cast (exporter); if (project.isAUPluginHost()) xcodeExporter.xcodeFrameworks.addTokens (xcodeExporter.isOSX() ? "AudioUnit CoreAudioKit" : "CoreAudioKit", false); diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_XCode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h similarity index 95% rename from extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_XCode.h rename to extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index 0607374a00..1ef47670b6 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_XCode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -44,7 +44,7 @@ namespace } //============================================================================== -class XCodeProjectExporter : public ProjectExporter +class XcodeProjectExporter : public ProjectExporter { public: //============================================================================== @@ -53,7 +53,7 @@ public: static const char* getValueTreeTypeName (bool iOS) { return iOS ? "XCODE_IPHONE" : "XCODE_MAC"; } //============================================================================== - XCodeProjectExporter (Project& p, const ValueTree& t, const bool isIOS) + XcodeProjectExporter (Project& p, const ValueTree& t, const bool isIOS) : ProjectExporter (p, t), xcodeCanUseDwarf (true), iOS (isIOS) @@ -73,10 +73,10 @@ public: } } - static XCodeProjectExporter* createForSettings (Project& project, const ValueTree& settings) + static XcodeProjectExporter* createForSettings (Project& project, const ValueTree& settings) { - if (settings.hasType (getValueTreeTypeName (false))) return new XCodeProjectExporter (project, settings, false); - if (settings.hasType (getValueTreeTypeName (true))) return new XCodeProjectExporter (project, settings, true); + if (settings.hasType (getValueTreeTypeName (false))) return new XcodeProjectExporter (project, settings, false); + if (settings.hasType (getValueTreeTypeName (true))) return new XcodeProjectExporter (project, settings, true); return nullptr; } @@ -338,7 +338,7 @@ public: { callForAllSupportedTargets ([this] (ProjectType::Target::Type targetType) { - if (XCodeTarget* target = new XCodeTarget (targetType, *this)) + if (XcodeTarget* target = new XcodeTarget (targetType, *this)) { if (targetType == ProjectType::Target::AggregateTarget) targets.insert (0, target); @@ -451,7 +451,7 @@ protected: } props.add (new ChoicePropertyComponent (osxSDKVersion.getPropertyAsValue(), "OSX Base SDK Version", sdkVersionNames, versionValues), - "The version of OSX to link against in the XCode build."); + "The version of OSX to link against in the Xcode build."); props.add (new ChoicePropertyComponent (osxDeploymentTarget.getPropertyAsValue(), "OSX Deployment Target", osxVersionNames, versionValues), "The minimum version of OSX that the target binary will be compatible with."); @@ -552,10 +552,10 @@ public: }; //============================================================================== - struct XCodeTarget : ProjectType::Target + struct XcodeTarget : ProjectType::Target { //============================================================================== - XCodeTarget (ProjectType::Target::Type targetType, const XCodeProjectExporter& exporter) + XcodeTarget (ProjectType::Target::Type targetType, const XcodeProjectExporter& exporter) : ProjectType::Target (targetType), owner (exporter) { @@ -675,7 +675,7 @@ public: } } - String getXCodeSchemeName() const + String getXcodeSchemeName() const { return owner.projectName + " - " + getName(); } @@ -1537,7 +1537,7 @@ public: } //============================================================================== - const XCodeProjectExporter& owner; + const XcodeProjectExporter& owner; Target& operator= (const Target&) JUCE_DELETED_FUNCTION; }; @@ -1548,7 +1548,7 @@ public: private: //============================================================================== bool xcodeCanUseDwarf; - OwnedArray targets; + OwnedArray targets; mutable OwnedArray pbxBuildFiles, pbxFileReferences, pbxGroups, misc, projectConfigs, targetConfigs; mutable StringArray resourceIDs, sourceIDs, targetIDs; @@ -1610,7 +1610,7 @@ private: { for (auto* target : targets) { - if (target->type == XCodeTarget::AggregateTarget) + if (target->type == XcodeTarget::AggregateTarget) continue; target->addMainBuildProduct(); @@ -1634,7 +1634,7 @@ private: { for (auto* target : targets) { - if (target->type == XCodeTarget::AggregateTarget) + if (target->type == XcodeTarget::AggregateTarget) continue; if (target->shouldCreatePList()) @@ -1716,7 +1716,7 @@ private: // add build phases for (auto* target : targets) { - if (target->type != XCodeTarget::AggregateTarget) + if (target->type != XcodeTarget::AggregateTarget) buildProducts.add (createID (String ("__productFileID") + String (target->getName()))); for (ConstConfigIterator config (*this); config.next();) @@ -1729,12 +1729,12 @@ private: target->addShellScriptBuildPhase ("Pre-build script", getPreBuildScript()); - if (target->type != XCodeTarget::AggregateTarget) + if (target->type != XcodeTarget::AggregateTarget) { - auto skipAUv3 = (target->type == XCodeTarget::AudioUnitv3PlugIn + auto skipAUv3 = (target->type == XcodeTarget::AudioUnitv3PlugIn && ! shouldDuplicateResourcesFolderForAppExtension()); - if (! projectType.isStaticLibrary() && target->type != XCodeTarget::SharedCodeTarget && ! skipAUv3) + if (! projectType.isStaticLibrary() && target->type != XcodeTarget::SharedCodeTarget && ! skipAUv3) target->addBuildPhase ("PBXResourcesBuildPhase", resourceIDs); StringArray rezFiles (rezFileIDs); @@ -1745,20 +1745,20 @@ private: StringArray sourceFiles (target->sourceIDs); - if (target->type == XCodeTarget::SharedCodeTarget + if (target->type == XcodeTarget::SharedCodeTarget || (! project.getProjectType().isAudioPlugin())) sourceFiles.addArray (sourceIDs); target->addBuildPhase ("PBXSourcesBuildPhase", sourceFiles); - if (! projectType.isStaticLibrary() && target->type != XCodeTarget::SharedCodeTarget) + if (! projectType.isStaticLibrary() && target->type != XcodeTarget::SharedCodeTarget) target->addBuildPhase ("PBXFrameworksBuildPhase", target->frameworkIDs); } target->addShellScriptBuildPhase ("Post-build script", getPostBuildScript()); if (project.getProjectType().isAudioPlugin() && project.shouldBuildAUv3() - && project.shouldBuildStandalonePlugin() && target->type == XCodeTarget::StandalonePlugIn) + && project.shouldBuildStandalonePlugin() && target->type == XcodeTarget::StandalonePlugIn) embedAppExtension(); addTargetObject (*target); @@ -1767,9 +1767,9 @@ private: void embedAppExtension() const { - if (auto* standaloneTarget = getTargetOfType (XCodeTarget::StandalonePlugIn)) + if (auto* standaloneTarget = getTargetOfType (XcodeTarget::StandalonePlugIn)) { - if (auto* auv3Target = getTargetOfType (XCodeTarget::AudioUnitv3PlugIn)) + if (auto* auv3Target = getTargetOfType (XcodeTarget::AudioUnitv3PlugIn)) { StringArray files; files.add (auv3Target->mainBuildProductID); @@ -1803,7 +1803,7 @@ private: } //============================================================================== - XCodeTarget* getTargetOfType (ProjectType::Target::Type type) const + XcodeTarget* getTargetOfType (ProjectType::Target::Type type) const { for (auto& target : targets) if (target->type == type) @@ -1812,23 +1812,23 @@ private: return nullptr; } - void addTargetObject (XCodeTarget& target) const + void addTargetObject (XcodeTarget& target) const { String targetName = target.getName(); String targetID = target.getID(); ValueTree* const v = new ValueTree (targetID); - v->setProperty ("isa", target.type == XCodeTarget::AggregateTarget ? "PBXAggregateTarget" : "PBXNativeTarget", nullptr); + v->setProperty ("isa", target.type == XcodeTarget::AggregateTarget ? "PBXAggregateTarget" : "PBXNativeTarget", nullptr); v->setProperty ("buildConfigurationList", createID (String ("__configList") + targetName), nullptr); v->setProperty ("buildPhases", indentParenthesisedList (target.buildPhaseIDs), nullptr); v->setProperty ("buildRules", "( )", nullptr); v->setProperty ("dependencies", indentParenthesisedList (getTargetDependencies (target)), nullptr); - v->setProperty (Ids::name, target.getXCodeSchemeName(), nullptr); + v->setProperty (Ids::name, target.getXcodeSchemeName(), nullptr); v->setProperty ("productName", projectName, nullptr); - if (target.type != XCodeTarget::AggregateTarget) + if (target.type != XcodeTarget::AggregateTarget) { v->setProperty ("productReference", createID (String ("__productFileID") + targetName), nullptr); @@ -1840,28 +1840,28 @@ private: misc.add (v); } - StringArray getTargetDependencies (const XCodeTarget& target) const + StringArray getTargetDependencies (const XcodeTarget& target) const { StringArray dependencies; if (project.getProjectType().isAudioPlugin()) { - if (target.type == XCodeTarget::StandalonePlugIn) // depends on AUv3 and shared code + if (target.type == XcodeTarget::StandalonePlugIn) // depends on AUv3 and shared code { - if (XCodeTarget* auv3Target = getTargetOfType (XCodeTarget::AudioUnitv3PlugIn)) + if (XcodeTarget* auv3Target = getTargetOfType (XcodeTarget::AudioUnitv3PlugIn)) dependencies.add (auv3Target->getDependencyID()); - if (XCodeTarget* sharedCodeTarget = getTargetOfType (XCodeTarget::SharedCodeTarget)) + if (XcodeTarget* sharedCodeTarget = getTargetOfType (XcodeTarget::SharedCodeTarget)) dependencies.add (sharedCodeTarget->getDependencyID()); } - else if (target.type == XCodeTarget::AggregateTarget) // depends on all other targets + else if (target.type == XcodeTarget::AggregateTarget) // depends on all other targets { for (int i = 1; i < targets.size(); ++i) dependencies.add (targets[i]->getDependencyID()); } - else if (target.type != XCodeTarget::SharedCodeTarget) // shared code doesn't depend on anything; all other targets depend only on the shared code + else if (target.type != XcodeTarget::SharedCodeTarget) // shared code doesn't depend on anything; all other targets depend only on the shared code { - if (XCodeTarget* sharedCodeTarget = getTargetOfType (XCodeTarget::SharedCodeTarget)) + if (XcodeTarget* sharedCodeTarget = getTargetOfType (XcodeTarget::SharedCodeTarget)) dependencies.add (sharedCodeTarget->getDependencyID()); } } @@ -2240,7 +2240,7 @@ private: output << "\t};\n\trootObject = " << createID ("__root") << ";\n}\n"; } - String addBuildFile (const String& path, const String& fileRefID, bool addToSourceBuildPhase, bool inhibitWarnings, XCodeTarget* xcodeTarget = nullptr) const + String addBuildFile (const String& path, const String& fileRefID, bool addToSourceBuildPhase, bool inhibitWarnings, XcodeTarget* xcodeTarget = nullptr) const { String fileID (createID (path + "buildref")); @@ -2261,7 +2261,7 @@ private: return fileID; } - String addBuildFile (const RelativePath& path, bool addToSourceBuildPhase, bool inhibitWarnings, XCodeTarget* xcodeTarget = nullptr) const + String addBuildFile (const RelativePath& path, bool addToSourceBuildPhase, bool inhibitWarnings, XcodeTarget* xcodeTarget = nullptr) const { return addBuildFile (path.toUnixStyle(), createFileRefID (path), addToSourceBuildPhase, inhibitWarnings, xcodeTarget); } @@ -2345,7 +2345,7 @@ private: } String addFile (const RelativePath& path, bool shouldBeCompiled, bool shouldBeAddedToBinaryResources, - bool shouldBeAddedToXcodeResources, bool inhibitWarnings, XCodeTarget* xcodeTarget) const + bool shouldBeAddedToXcodeResources, bool inhibitWarnings, XcodeTarget* xcodeTarget) const { const String pathAsString (path.toUnixStyle()); const String refID (addFileReference (path.toUnixStyle())); @@ -2375,7 +2375,7 @@ private: if (projectItem.isModuleCode()) { - if (XCodeTarget* xcodeTarget = getTargetOfType (getProject().getTargetTypeFromFilePath (projectItem.getFile(), false))) + if (XcodeTarget* xcodeTarget = getTargetOfType (getProject().getTargetTypeFromFilePath (projectItem.getFile(), false))) { String rezFileID = addBuildFile (pathAsString, refID, false, false, xcodeTarget); xcodeTarget->rezFileIDs.add (rezFileID); @@ -2486,7 +2486,7 @@ private: if (path.hasFileExtension (".r")) return addRezFile (projectItem, path); - XCodeTarget* xcodeTarget = nullptr; + XcodeTarget* xcodeTarget = nullptr; if (projectItem.isModuleCode() && projectItem.shouldBeCompiled()) xcodeTarget = getTargetOfType (project.getTargetTypeFromFilePath (projectItem.getFile(), false)); @@ -2544,7 +2544,7 @@ private: projectConfigs.add (v); } - void addConfigList (XCodeTarget& target, const OwnedArray & configsToUse, const String& listID) const + void addConfigList (XcodeTarget& target, const OwnedArray & configsToUse, const String& listID) const { ValueTree* v = new ValueTree (listID); v->setProperty ("isa", "XCConfigurationList", nullptr); @@ -2652,7 +2652,7 @@ private: StringArray names; for (auto& target : targets) - names.add (target->getXCodeSchemeName()); + names.add (target->getXcodeSchemeName()); names.sort (false); return names; @@ -2897,5 +2897,5 @@ private: return getOSXVersionName (version) + " SDK"; } - JUCE_DECLARE_NON_COPYABLE (XCodeProjectExporter) + JUCE_DECLARE_NON_COPYABLE (XcodeProjectExporter) }; diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index 112149f348..757205ca0a 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -30,7 +30,7 @@ #include "jucer_ProjectExport_Make.h" #include "jucer_ProjectExport_MSVC.h" -#include "jucer_ProjectExport_XCode.h" +#include "jucer_ProjectExport_Xcode.h" #include "jucer_ProjectExport_Android.h" #include "jucer_ProjectExport_CodeBlocks.h" @@ -46,8 +46,8 @@ Array ProjectExporter::getExporterTypes() { Array types; - addType (types, XCodeProjectExporter::getNameMac(), BinaryData::export_xcode_svg, BinaryData::export_xcode_svgSize); - addType (types, XCodeProjectExporter::getNameiOS(), BinaryData::export_xcode_svg, BinaryData::export_xcode_svgSize); + addType (types, XcodeProjectExporter::getNameMac(), BinaryData::export_xcode_svg, BinaryData::export_xcode_svgSize); + addType (types, XcodeProjectExporter::getNameiOS(), BinaryData::export_xcode_svg, BinaryData::export_xcode_svgSize); addType (types, MSVCProjectExporterVC2017::getName(), BinaryData::export_visualStudio_svg, BinaryData::export_visualStudio_svgSize); addType (types, MSVCProjectExporterVC2015::getName(), BinaryData::export_visualStudio_svg, BinaryData::export_visualStudio_svgSize); addType (types, MSVCProjectExporterVC2013::getName(), BinaryData::export_visualStudio_svg, BinaryData::export_visualStudio_svgSize); @@ -65,8 +65,8 @@ ProjectExporter* ProjectExporter::createNewExporter (Project& project, const int switch (index) { - case 0: exp = new XCodeProjectExporter (project, ValueTree (XCodeProjectExporter ::getValueTreeTypeName (false)), false); break; - case 1: exp = new XCodeProjectExporter (project, ValueTree (XCodeProjectExporter ::getValueTreeTypeName (true)), true); break; + case 0: exp = new XcodeProjectExporter (project, ValueTree (XcodeProjectExporter ::getValueTreeTypeName (false)), false); break; + case 1: exp = new XcodeProjectExporter (project, ValueTree (XcodeProjectExporter ::getValueTreeTypeName (true)), true); break; case 2: exp = new MSVCProjectExporterVC2017 (project, ValueTree (MSVCProjectExporterVC2017 ::getValueTreeTypeName())); break; case 3: exp = new MSVCProjectExporterVC2015 (project, ValueTree (MSVCProjectExporterVC2015 ::getValueTreeTypeName())); break; case 4: exp = new MSVCProjectExporterVC2013 (project, ValueTree (MSVCProjectExporterVC2013 ::getValueTreeTypeName())); break; @@ -95,11 +95,11 @@ StringArray ProjectExporter::getExporterNames() String ProjectExporter::getValueTreeNameForExporter (const String& exporterName) { - if (exporterName == XCodeProjectExporter::getNameMac()) - return XCodeProjectExporter::getValueTreeTypeName (false); + if (exporterName == XcodeProjectExporter::getNameMac()) + return XcodeProjectExporter::getValueTreeTypeName (false); - if (exporterName == XCodeProjectExporter::getNameiOS()) - return XCodeProjectExporter::getValueTreeTypeName (true); + if (exporterName == XcodeProjectExporter::getNameiOS()) + return XcodeProjectExporter::getValueTreeTypeName (true); if (exporterName == MSVCProjectExporterVC2013::getName()) return MSVCProjectExporterVC2013::getValueTreeTypeName(); @@ -145,7 +145,7 @@ StringArray ProjectExporter::getAllDefaultBuildsFolders() String ProjectExporter::getCurrentPlatformExporterName() { #if JUCE_MAC - return XCodeProjectExporter::getNameMac(); + return XcodeProjectExporter::getNameMac(); #elif JUCE_WINDOWS return MSVCProjectExporterVC2017::getName(); #elif JUCE_LINUX @@ -165,7 +165,7 @@ ProjectExporter* ProjectExporter::createExporter (Project& project, const ValueT ProjectExporter* exp = MSVCProjectExporterVC2013 ::createForSettings (project, settings); if (exp == nullptr) exp = MSVCProjectExporterVC2015 ::createForSettings (project, settings); if (exp == nullptr) exp = MSVCProjectExporterVC2017 ::createForSettings (project, settings); - if (exp == nullptr) exp = XCodeProjectExporter ::createForSettings (project, settings); + if (exp == nullptr) exp = XcodeProjectExporter ::createForSettings (project, settings); if (exp == nullptr) exp = MakefileProjectExporter ::createForSettings (project, settings); if (exp == nullptr) exp = AndroidProjectExporter ::createForSettings (project, settings); if (exp == nullptr) exp = CodeBlocksProjectExporter ::createForSettings (project, settings); @@ -181,8 +181,8 @@ bool ProjectExporter::canProjectBeLaunched (Project* project) const char* types[] = { #if JUCE_MAC - XCodeProjectExporter::getValueTreeTypeName (false), - XCodeProjectExporter::getValueTreeTypeName (true), + XcodeProjectExporter::getValueTreeTypeName (false), + XcodeProjectExporter::getValueTreeTypeName (true), #elif JUCE_WINDOWS MSVCProjectExporterVC2013::getValueTreeTypeName(), MSVCProjectExporterVC2015::getValueTreeTypeName(), diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS.r b/modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS.r index b407485a29..ad01d4d59a 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS.r +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS.r @@ -1,7 +1,7 @@ /* This dummy file is added to the resources section of the project to - force XCode to create some resources for the dpm. If there aren't any + force Xcode to create some resources for the dpm. If there aren't any resources, PT will refuse to load the plugin.. */ diff --git a/modules/juce_core/native/juce_mac_ClangBugWorkaround.h b/modules/juce_core/native/juce_mac_ClangBugWorkaround.h index e270d47ac2..3bbee9ae3c 100644 --- a/modules/juce_core/native/juce_mac_ClangBugWorkaround.h +++ b/modules/juce_core/native/juce_mac_ClangBugWorkaround.h @@ -28,7 +28,7 @@ #undef CF_OPTIONS #define CF_OPTIONS(_type, _name) _type _name; enum - // This is a workaround for the XCode 9 version of NSUUID.h causing some errors + // This is a workaround for the Xcode 9 version of NSUUID.h causing some errors // in the live-build engine. #define _Nullable #define _Nonnull