| @@ -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 | @section standalone_building_library Building the SDK library | ||||
| The source code for the BLOCKS SDK library is contained within the <tt>SDK</tt> directory of the BLOCKS-SDK repository. | The source code for the BLOCKS SDK library is contained within the <tt>SDK</tt> directory of the BLOCKS-SDK repository. | ||||
| Here you will find header files that you can include in your own projects and the <tt>Build</tt> 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 <tt>Build</tt> 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. | Use the appropriate choice for your platform, select either the "Debug" or "Release" configuration, and build the project. | ||||
| For MacOS this will produce <tt>libBLOCKS-SDK.a</tt> in either the <tt>SDK/Build/MacOS/Debug/</tt> or <tt>SDK/Build/MacOS/Release/</tt> directory, for Linux this will produce <tt>libBLOCKS-SDK.a</tt> in either the <tt>SDK/Build/Linux/Debug/</tt> or <tt>SDK/Build/Linux/Release/</tt> directory, and for Windows this will produce <tt>BLOCKS-SDK.lib</tt> in either the <tt>SDK\\Build\\Windows\\x64\\Debug</tt> or <tt>SDK\\Build\\Windows\\x64\\Release</tt> folder. | For MacOS this will produce <tt>libBLOCKS-SDK.a</tt> in either the <tt>SDK/Build/MacOS/Debug/</tt> or <tt>SDK/Build/MacOS/Release/</tt> directory, for Linux this will produce <tt>libBLOCKS-SDK.a</tt> in either the <tt>SDK/Build/Linux/Debug/</tt> or <tt>SDK/Build/Linux/Release/</tt> directory, and for Windows this will produce <tt>BLOCKS-SDK.lib</tt> in either the <tt>SDK\\Build\\Windows\\x64\\Debug</tt> or <tt>SDK\\Build\\Windows\\x64\\Release</tt> folder. | ||||
| @@ -18,13 +18,13 @@ For MacOS this will produce <tt>libBLOCKS-SDK.a</tt> in either the <tt>SDK/Build | |||||
| @section standalone_using_header Using the SDK header file | @section standalone_using_header Using the SDK header file | ||||
| To use BLOCKS classes and functions in your application you must include the <tt>BlocksHeader.h</tt> file in your source code. | To use BLOCKS classes and functions in your application you must include the <tt>BlocksHeader.h</tt> file in your source code. | ||||
| You also need to tell the compiler to look in the <tt>SDK</tt> 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 <tt>SDK</tt> 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 <tt>examples/BLOCKS-SDK/BlockFinder/Linux/Makefile</tt> (which is also configured for MacOS, despite being located inside the Linux directory). | If you are using the command line to compile your application then you can see an example of how to do this in <tt>examples/BLOCKS-SDK/BlockFinder/Linux/Makefile</tt> (which is also configured for MacOS, despite being located inside the Linux directory). | ||||
| @section standalone_linking Linking against the SDK library | @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. | 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 <tt>examples/BLOCKS-SDK/BlockFinder/Linux/Makefile</tt> (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 <tt>examples/BLOCKS-SDK/BlockFinder/Linux/Makefile</tt> (which, again, is also configured for MacOS). | |||||
| @section standalone_example An example application | @section standalone_example An example application | ||||
| @@ -37,17 +37,17 @@ This will produce the executable `BlockFinder` in the `Debug` directory. | |||||
| ### Compiling the library | ### 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. | 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 | ### 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 | ### 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 | ## Dependencies | ||||
| @@ -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"; }; | 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"; }; | 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"; }; | 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"; }; | 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"; }; | 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"; }; | 2F373F97E30AC1A0BFC1FC61 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_FilePropertyComponent.h"; path = "../../Source/ComponentEditor/Properties/jucer_FilePropertyComponent.h"; sourceTree = "SOURCE_ROOT"; }; | ||||
| @@ -1520,7 +1520,7 @@ | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"/> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Xcode.h"/> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/> | ||||
| @@ -2127,7 +2127,7 @@ | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"> | ||||
| <Filter>Projucer\ProjectSaving</Filter> | <Filter>Projucer\ProjectSaving</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Xcode.h"> | |||||
| <Filter>Projucer\ProjectSaving</Filter> | <Filter>Projucer\ProjectSaving</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"> | ||||
| @@ -1520,7 +1520,7 @@ | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"/> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Xcode.h"/> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/> | ||||
| @@ -2127,7 +2127,7 @@ | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"> | ||||
| <Filter>Projucer\ProjectSaving</Filter> | <Filter>Projucer\ProjectSaving</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Xcode.h"> | |||||
| <Filter>Projucer\ProjectSaving</Filter> | <Filter>Projucer\ProjectSaving</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"> | ||||
| @@ -1520,7 +1520,7 @@ | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_CodeBlocks.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Make.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"/> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Xcode.h"/> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectSaver.h"/> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ResourceFile.h"/> | ||||
| @@ -2127,7 +2127,7 @@ | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_MSVC.h"> | ||||
| <Filter>Projucer\ProjectSaving</Filter> | <Filter>Projucer\ProjectSaving</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_XCode.h"> | |||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExport_Xcode.h"> | |||||
| <Filter>Projucer\ProjectSaving</Filter> | <Filter>Projucer\ProjectSaving</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"> | <ClInclude Include="..\..\Source\ProjectSaving\jucer_ProjectExporter.h"> | ||||
| @@ -553,8 +553,8 @@ | |||||
| file="Source/ProjectSaving/jucer_ProjectExport_Make.h"/> | file="Source/ProjectSaving/jucer_ProjectExport_Make.h"/> | ||||
| <FILE id="rMbSVA" name="jucer_ProjectExport_MSVC.h" compile="0" resource="0" | <FILE id="rMbSVA" name="jucer_ProjectExport_MSVC.h" compile="0" resource="0" | ||||
| file="Source/ProjectSaving/jucer_ProjectExport_MSVC.h"/> | file="Source/ProjectSaving/jucer_ProjectExport_MSVC.h"/> | ||||
| <FILE id="aKKWtG" name="jucer_ProjectExport_XCode.h" compile="0" resource="0" | |||||
| file="Source/ProjectSaving/jucer_ProjectExport_XCode.h"/> | |||||
| <FILE id="aKKWtG" name="jucer_ProjectExport_Xcode.h" compile="0" resource="0" | |||||
| file="Source/ProjectSaving/jucer_ProjectExport_Xcode.h"/> | |||||
| <FILE id="EqKGRV" name="jucer_ProjectExporter.cpp" compile="1" resource="0" | <FILE id="EqKGRV" name="jucer_ProjectExporter.cpp" compile="1" resource="0" | ||||
| file="Source/ProjectSaving/jucer_ProjectExporter.cpp"/> | file="Source/ProjectSaving/jucer_ProjectExporter.cpp"/> | ||||
| <FILE id="FEsoP1" name="jucer_ProjectExporter.h" compile="0" resource="0" | <FILE id="FEsoP1" name="jucer_ProjectExporter.h" compile="0" resource="0" | ||||
| @@ -27,7 +27,7 @@ | |||||
| #include "../Application/jucer_Headers.h" | #include "../Application/jucer_Headers.h" | ||||
| #include "jucer_Module.h" | #include "jucer_Module.h" | ||||
| #include "../ProjectSaving/jucer_ProjectSaver.h" | #include "../ProjectSaving/jucer_ProjectSaver.h" | ||||
| #include "../ProjectSaving/jucer_ProjectExport_XCode.h" | |||||
| #include "../ProjectSaving/jucer_ProjectExport_Xcode.h" | |||||
| //============================================================================== | //============================================================================== | ||||
| static String trimCommentCharsFromStartOfLine (const String& line) | static String trimCommentCharsFromStartOfLine (const String& line) | ||||
| @@ -394,7 +394,7 @@ void LibraryModule::addSettingsForModuleToExporter (ProjectExporter& exporter, P | |||||
| if (exporter.isXcode()) | if (exporter.isXcode()) | ||||
| { | { | ||||
| auto& xcodeExporter = dynamic_cast<XCodeProjectExporter&> (exporter); | |||||
| auto& xcodeExporter = dynamic_cast<XcodeProjectExporter&> (exporter); | |||||
| if (project.isAUPluginHost()) | if (project.isAUPluginHost()) | ||||
| xcodeExporter.xcodeFrameworks.addTokens (xcodeExporter.isOSX() ? "AudioUnit CoreAudioKit" : "CoreAudioKit", false); | xcodeExporter.xcodeFrameworks.addTokens (xcodeExporter.isOSX() ? "AudioUnit CoreAudioKit" : "CoreAudioKit", false); | ||||
| @@ -44,7 +44,7 @@ namespace | |||||
| } | } | ||||
| //============================================================================== | //============================================================================== | ||||
| class XCodeProjectExporter : public ProjectExporter | |||||
| class XcodeProjectExporter : public ProjectExporter | |||||
| { | { | ||||
| public: | public: | ||||
| //============================================================================== | //============================================================================== | ||||
| @@ -53,7 +53,7 @@ public: | |||||
| static const char* getValueTreeTypeName (bool iOS) { return iOS ? "XCODE_IPHONE" : "XCODE_MAC"; } | 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), | : ProjectExporter (p, t), | ||||
| xcodeCanUseDwarf (true), | xcodeCanUseDwarf (true), | ||||
| iOS (isIOS) | 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; | return nullptr; | ||||
| } | } | ||||
| @@ -338,7 +338,7 @@ public: | |||||
| { | { | ||||
| callForAllSupportedTargets ([this] (ProjectType::Target::Type targetType) | 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) | if (targetType == ProjectType::Target::AggregateTarget) | ||||
| targets.insert (0, target); | targets.insert (0, target); | ||||
| @@ -451,7 +451,7 @@ protected: | |||||
| } | } | ||||
| props.add (new ChoicePropertyComponent (osxSDKVersion.getPropertyAsValue(), "OSX Base SDK Version", sdkVersionNames, versionValues), | 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), | props.add (new ChoicePropertyComponent (osxDeploymentTarget.getPropertyAsValue(), "OSX Deployment Target", osxVersionNames, versionValues), | ||||
| "The minimum version of OSX that the target binary will be compatible with."); | "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), | : ProjectType::Target (targetType), | ||||
| owner (exporter) | owner (exporter) | ||||
| { | { | ||||
| @@ -675,7 +675,7 @@ public: | |||||
| } | } | ||||
| } | } | ||||
| String getXCodeSchemeName() const | |||||
| String getXcodeSchemeName() const | |||||
| { | { | ||||
| return owner.projectName + " - " + getName(); | return owner.projectName + " - " + getName(); | ||||
| } | } | ||||
| @@ -1537,7 +1537,7 @@ public: | |||||
| } | } | ||||
| //============================================================================== | //============================================================================== | ||||
| const XCodeProjectExporter& owner; | |||||
| const XcodeProjectExporter& owner; | |||||
| Target& operator= (const Target&) JUCE_DELETED_FUNCTION; | Target& operator= (const Target&) JUCE_DELETED_FUNCTION; | ||||
| }; | }; | ||||
| @@ -1548,7 +1548,7 @@ public: | |||||
| private: | private: | ||||
| //============================================================================== | //============================================================================== | ||||
| bool xcodeCanUseDwarf; | bool xcodeCanUseDwarf; | ||||
| OwnedArray<XCodeTarget> targets; | |||||
| OwnedArray<XcodeTarget> targets; | |||||
| mutable OwnedArray<ValueTree> pbxBuildFiles, pbxFileReferences, pbxGroups, misc, projectConfigs, targetConfigs; | mutable OwnedArray<ValueTree> pbxBuildFiles, pbxFileReferences, pbxGroups, misc, projectConfigs, targetConfigs; | ||||
| mutable StringArray resourceIDs, sourceIDs, targetIDs; | mutable StringArray resourceIDs, sourceIDs, targetIDs; | ||||
| @@ -1610,7 +1610,7 @@ private: | |||||
| { | { | ||||
| for (auto* target : targets) | for (auto* target : targets) | ||||
| { | { | ||||
| if (target->type == XCodeTarget::AggregateTarget) | |||||
| if (target->type == XcodeTarget::AggregateTarget) | |||||
| continue; | continue; | ||||
| target->addMainBuildProduct(); | target->addMainBuildProduct(); | ||||
| @@ -1634,7 +1634,7 @@ private: | |||||
| { | { | ||||
| for (auto* target : targets) | for (auto* target : targets) | ||||
| { | { | ||||
| if (target->type == XCodeTarget::AggregateTarget) | |||||
| if (target->type == XcodeTarget::AggregateTarget) | |||||
| continue; | continue; | ||||
| if (target->shouldCreatePList()) | if (target->shouldCreatePList()) | ||||
| @@ -1716,7 +1716,7 @@ private: | |||||
| // add build phases | // add build phases | ||||
| for (auto* target : targets) | for (auto* target : targets) | ||||
| { | { | ||||
| if (target->type != XCodeTarget::AggregateTarget) | |||||
| if (target->type != XcodeTarget::AggregateTarget) | |||||
| buildProducts.add (createID (String ("__productFileID") + String (target->getName()))); | buildProducts.add (createID (String ("__productFileID") + String (target->getName()))); | ||||
| for (ConstConfigIterator config (*this); config.next();) | for (ConstConfigIterator config (*this); config.next();) | ||||
| @@ -1729,12 +1729,12 @@ private: | |||||
| target->addShellScriptBuildPhase ("Pre-build script", getPreBuildScript()); | 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()); | && ! shouldDuplicateResourcesFolderForAppExtension()); | ||||
| if (! projectType.isStaticLibrary() && target->type != XCodeTarget::SharedCodeTarget && ! skipAUv3) | |||||
| if (! projectType.isStaticLibrary() && target->type != XcodeTarget::SharedCodeTarget && ! skipAUv3) | |||||
| target->addBuildPhase ("PBXResourcesBuildPhase", resourceIDs); | target->addBuildPhase ("PBXResourcesBuildPhase", resourceIDs); | ||||
| StringArray rezFiles (rezFileIDs); | StringArray rezFiles (rezFileIDs); | ||||
| @@ -1745,20 +1745,20 @@ private: | |||||
| StringArray sourceFiles (target->sourceIDs); | StringArray sourceFiles (target->sourceIDs); | ||||
| if (target->type == XCodeTarget::SharedCodeTarget | |||||
| if (target->type == XcodeTarget::SharedCodeTarget | |||||
| || (! project.getProjectType().isAudioPlugin())) | || (! project.getProjectType().isAudioPlugin())) | ||||
| sourceFiles.addArray (sourceIDs); | sourceFiles.addArray (sourceIDs); | ||||
| target->addBuildPhase ("PBXSourcesBuildPhase", sourceFiles); | target->addBuildPhase ("PBXSourcesBuildPhase", sourceFiles); | ||||
| if (! projectType.isStaticLibrary() && target->type != XCodeTarget::SharedCodeTarget) | |||||
| if (! projectType.isStaticLibrary() && target->type != XcodeTarget::SharedCodeTarget) | |||||
| target->addBuildPhase ("PBXFrameworksBuildPhase", target->frameworkIDs); | target->addBuildPhase ("PBXFrameworksBuildPhase", target->frameworkIDs); | ||||
| } | } | ||||
| target->addShellScriptBuildPhase ("Post-build script", getPostBuildScript()); | target->addShellScriptBuildPhase ("Post-build script", getPostBuildScript()); | ||||
| if (project.getProjectType().isAudioPlugin() && project.shouldBuildAUv3() | if (project.getProjectType().isAudioPlugin() && project.shouldBuildAUv3() | ||||
| && project.shouldBuildStandalonePlugin() && target->type == XCodeTarget::StandalonePlugIn) | |||||
| && project.shouldBuildStandalonePlugin() && target->type == XcodeTarget::StandalonePlugIn) | |||||
| embedAppExtension(); | embedAppExtension(); | ||||
| addTargetObject (*target); | addTargetObject (*target); | ||||
| @@ -1767,9 +1767,9 @@ private: | |||||
| void embedAppExtension() const | 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; | StringArray files; | ||||
| files.add (auv3Target->mainBuildProductID); | 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) | for (auto& target : targets) | ||||
| if (target->type == type) | if (target->type == type) | ||||
| @@ -1812,23 +1812,23 @@ private: | |||||
| return nullptr; | return nullptr; | ||||
| } | } | ||||
| void addTargetObject (XCodeTarget& target) const | |||||
| void addTargetObject (XcodeTarget& target) const | |||||
| { | { | ||||
| String targetName = target.getName(); | String targetName = target.getName(); | ||||
| String targetID = target.getID(); | String targetID = target.getID(); | ||||
| ValueTree* const v = new ValueTree (targetID); | 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 ("buildConfigurationList", createID (String ("__configList") + targetName), nullptr); | ||||
| v->setProperty ("buildPhases", indentParenthesisedList (target.buildPhaseIDs), nullptr); | v->setProperty ("buildPhases", indentParenthesisedList (target.buildPhaseIDs), nullptr); | ||||
| v->setProperty ("buildRules", "( )", nullptr); | v->setProperty ("buildRules", "( )", nullptr); | ||||
| v->setProperty ("dependencies", indentParenthesisedList (getTargetDependencies (target)), 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); | v->setProperty ("productName", projectName, nullptr); | ||||
| if (target.type != XCodeTarget::AggregateTarget) | |||||
| if (target.type != XcodeTarget::AggregateTarget) | |||||
| { | { | ||||
| v->setProperty ("productReference", createID (String ("__productFileID") + targetName), nullptr); | v->setProperty ("productReference", createID (String ("__productFileID") + targetName), nullptr); | ||||
| @@ -1840,28 +1840,28 @@ private: | |||||
| misc.add (v); | misc.add (v); | ||||
| } | } | ||||
| StringArray getTargetDependencies (const XCodeTarget& target) const | |||||
| StringArray getTargetDependencies (const XcodeTarget& target) const | |||||
| { | { | ||||
| StringArray dependencies; | StringArray dependencies; | ||||
| if (project.getProjectType().isAudioPlugin()) | 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()); | dependencies.add (auv3Target->getDependencyID()); | ||||
| if (XCodeTarget* sharedCodeTarget = getTargetOfType (XCodeTarget::SharedCodeTarget)) | |||||
| if (XcodeTarget* sharedCodeTarget = getTargetOfType (XcodeTarget::SharedCodeTarget)) | |||||
| dependencies.add (sharedCodeTarget->getDependencyID()); | 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) | for (int i = 1; i < targets.size(); ++i) | ||||
| dependencies.add (targets[i]->getDependencyID()); | 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()); | dependencies.add (sharedCodeTarget->getDependencyID()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -2240,7 +2240,7 @@ private: | |||||
| output << "\t};\n\trootObject = " << createID ("__root") << ";\n}\n"; | 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")); | String fileID (createID (path + "buildref")); | ||||
| @@ -2261,7 +2261,7 @@ private: | |||||
| return fileID; | 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); | return addBuildFile (path.toUnixStyle(), createFileRefID (path), addToSourceBuildPhase, inhibitWarnings, xcodeTarget); | ||||
| } | } | ||||
| @@ -2345,7 +2345,7 @@ private: | |||||
| } | } | ||||
| String addFile (const RelativePath& path, bool shouldBeCompiled, bool shouldBeAddedToBinaryResources, | 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 pathAsString (path.toUnixStyle()); | ||||
| const String refID (addFileReference (path.toUnixStyle())); | const String refID (addFileReference (path.toUnixStyle())); | ||||
| @@ -2375,7 +2375,7 @@ private: | |||||
| if (projectItem.isModuleCode()) | 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); | String rezFileID = addBuildFile (pathAsString, refID, false, false, xcodeTarget); | ||||
| xcodeTarget->rezFileIDs.add (rezFileID); | xcodeTarget->rezFileIDs.add (rezFileID); | ||||
| @@ -2486,7 +2486,7 @@ private: | |||||
| if (path.hasFileExtension (".r")) | if (path.hasFileExtension (".r")) | ||||
| return addRezFile (projectItem, path); | return addRezFile (projectItem, path); | ||||
| XCodeTarget* xcodeTarget = nullptr; | |||||
| XcodeTarget* xcodeTarget = nullptr; | |||||
| if (projectItem.isModuleCode() && projectItem.shouldBeCompiled()) | if (projectItem.isModuleCode() && projectItem.shouldBeCompiled()) | ||||
| xcodeTarget = getTargetOfType (project.getTargetTypeFromFilePath (projectItem.getFile(), false)); | xcodeTarget = getTargetOfType (project.getTargetTypeFromFilePath (projectItem.getFile(), false)); | ||||
| @@ -2544,7 +2544,7 @@ private: | |||||
| projectConfigs.add (v); | projectConfigs.add (v); | ||||
| } | } | ||||
| void addConfigList (XCodeTarget& target, const OwnedArray <ValueTree>& configsToUse, const String& listID) const | |||||
| void addConfigList (XcodeTarget& target, const OwnedArray <ValueTree>& configsToUse, const String& listID) const | |||||
| { | { | ||||
| ValueTree* v = new ValueTree (listID); | ValueTree* v = new ValueTree (listID); | ||||
| v->setProperty ("isa", "XCConfigurationList", nullptr); | v->setProperty ("isa", "XCConfigurationList", nullptr); | ||||
| @@ -2652,7 +2652,7 @@ private: | |||||
| StringArray names; | StringArray names; | ||||
| for (auto& target : targets) | for (auto& target : targets) | ||||
| names.add (target->getXCodeSchemeName()); | |||||
| names.add (target->getXcodeSchemeName()); | |||||
| names.sort (false); | names.sort (false); | ||||
| return names; | return names; | ||||
| @@ -2897,5 +2897,5 @@ private: | |||||
| return getOSXVersionName (version) + " SDK"; | return getOSXVersionName (version) + " SDK"; | ||||
| } | } | ||||
| JUCE_DECLARE_NON_COPYABLE (XCodeProjectExporter) | |||||
| JUCE_DECLARE_NON_COPYABLE (XcodeProjectExporter) | |||||
| }; | }; | ||||
| @@ -30,7 +30,7 @@ | |||||
| #include "jucer_ProjectExport_Make.h" | #include "jucer_ProjectExport_Make.h" | ||||
| #include "jucer_ProjectExport_MSVC.h" | #include "jucer_ProjectExport_MSVC.h" | ||||
| #include "jucer_ProjectExport_XCode.h" | |||||
| #include "jucer_ProjectExport_Xcode.h" | |||||
| #include "jucer_ProjectExport_Android.h" | #include "jucer_ProjectExport_Android.h" | ||||
| #include "jucer_ProjectExport_CodeBlocks.h" | #include "jucer_ProjectExport_CodeBlocks.h" | ||||
| @@ -46,8 +46,8 @@ Array<ProjectExporter::ExporterTypeInfo> ProjectExporter::getExporterTypes() | |||||
| { | { | ||||
| Array<ProjectExporter::ExporterTypeInfo> types; | Array<ProjectExporter::ExporterTypeInfo> 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, MSVCProjectExporterVC2017::getName(), BinaryData::export_visualStudio_svg, BinaryData::export_visualStudio_svgSize); | ||||
| addType (types, MSVCProjectExporterVC2015::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); | 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) | 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 2: exp = new MSVCProjectExporterVC2017 (project, ValueTree (MSVCProjectExporterVC2017 ::getValueTreeTypeName())); break; | ||||
| case 3: exp = new MSVCProjectExporterVC2015 (project, ValueTree (MSVCProjectExporterVC2015 ::getValueTreeTypeName())); break; | case 3: exp = new MSVCProjectExporterVC2015 (project, ValueTree (MSVCProjectExporterVC2015 ::getValueTreeTypeName())); break; | ||||
| case 4: exp = new MSVCProjectExporterVC2013 (project, ValueTree (MSVCProjectExporterVC2013 ::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) | 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()) | if (exporterName == MSVCProjectExporterVC2013::getName()) | ||||
| return MSVCProjectExporterVC2013::getValueTreeTypeName(); | return MSVCProjectExporterVC2013::getValueTreeTypeName(); | ||||
| @@ -145,7 +145,7 @@ StringArray ProjectExporter::getAllDefaultBuildsFolders() | |||||
| String ProjectExporter::getCurrentPlatformExporterName() | String ProjectExporter::getCurrentPlatformExporterName() | ||||
| { | { | ||||
| #if JUCE_MAC | #if JUCE_MAC | ||||
| return XCodeProjectExporter::getNameMac(); | |||||
| return XcodeProjectExporter::getNameMac(); | |||||
| #elif JUCE_WINDOWS | #elif JUCE_WINDOWS | ||||
| return MSVCProjectExporterVC2017::getName(); | return MSVCProjectExporterVC2017::getName(); | ||||
| #elif JUCE_LINUX | #elif JUCE_LINUX | ||||
| @@ -165,7 +165,7 @@ ProjectExporter* ProjectExporter::createExporter (Project& project, const ValueT | |||||
| ProjectExporter* exp = MSVCProjectExporterVC2013 ::createForSettings (project, settings); | ProjectExporter* exp = MSVCProjectExporterVC2013 ::createForSettings (project, settings); | ||||
| if (exp == nullptr) exp = MSVCProjectExporterVC2015 ::createForSettings (project, settings); | if (exp == nullptr) exp = MSVCProjectExporterVC2015 ::createForSettings (project, settings); | ||||
| if (exp == nullptr) exp = MSVCProjectExporterVC2017 ::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 = MakefileProjectExporter ::createForSettings (project, settings); | ||||
| if (exp == nullptr) exp = AndroidProjectExporter ::createForSettings (project, settings); | if (exp == nullptr) exp = AndroidProjectExporter ::createForSettings (project, settings); | ||||
| if (exp == nullptr) exp = CodeBlocksProjectExporter ::createForSettings (project, settings); | if (exp == nullptr) exp = CodeBlocksProjectExporter ::createForSettings (project, settings); | ||||
| @@ -181,8 +181,8 @@ bool ProjectExporter::canProjectBeLaunched (Project* project) | |||||
| const char* types[] = | const char* types[] = | ||||
| { | { | ||||
| #if JUCE_MAC | #if JUCE_MAC | ||||
| XCodeProjectExporter::getValueTreeTypeName (false), | |||||
| XCodeProjectExporter::getValueTreeTypeName (true), | |||||
| XcodeProjectExporter::getValueTreeTypeName (false), | |||||
| XcodeProjectExporter::getValueTreeTypeName (true), | |||||
| #elif JUCE_WINDOWS | #elif JUCE_WINDOWS | ||||
| MSVCProjectExporterVC2013::getValueTreeTypeName(), | MSVCProjectExporterVC2013::getValueTreeTypeName(), | ||||
| MSVCProjectExporterVC2015::getValueTreeTypeName(), | MSVCProjectExporterVC2015::getValueTreeTypeName(), | ||||
| @@ -1,7 +1,7 @@ | |||||
| /* | /* | ||||
| This dummy file is added to the resources section of the project to | 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.. | resources, PT will refuse to load the plugin.. | ||||
| */ | */ | ||||
| @@ -28,7 +28,7 @@ | |||||
| #undef CF_OPTIONS | #undef CF_OPTIONS | ||||
| #define CF_OPTIONS(_type, _name) _type _name; enum | #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. | // in the live-build engine. | ||||
| #define _Nullable | #define _Nullable | ||||
| #define _Nonnull | #define _Nonnull | ||||