mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

CLion: Fixed a Rez error when building AU plug-ins

Browse source
This commit is contained in:
Tom Poole 2019-01-18 14:48:42 +00:00
parent da2b10ada6
commit 020f3aa512
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CLion.h
View file

@ -172,7 +172,7 @@ public:
out.setNewLineString ("\n");
out << "# Automatically generated CMakeLists, created by the Projucer" << newLine
<< "# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!" << newLine
<< "# Do not edit this file! Your changes will be overwritten when you re-save the Projucer project!" << newLine
<< newLine;
out << "cmake_minimum_required (VERSION 3.4.1)" << newLine
@ -336,7 +336,7 @@ private:
functionName = "add_executable";
if (exporter.isCodeBlocks() && exporter.isWindows()
&& target->type != ProjectType::Target::Type::ConsoleApp)
&& target->type != ProjectType::Target::Type::ConsoleApp)
properties.add ("WIN32");
break;
@ -670,7 +670,7 @@ private:
//==============================================================================
void writeCMakeListsXcodeSection (OutputStream& out, XcodeProjectExporter& exporter) const
{
// We need to dind out the SDK root before defining the project. Unfortunately this is
// We need to find out the SDK root before defining the project. Unfortunately this is
// set per-target in the Xcode project, but we want it per-configuration.
for (ProjectExporter::ConstConfigIterator c (exporter); c.next();)
{
@ -679,8 +679,8 @@ private:
for (auto* target : exporter.targets)
{
if (target->getTargetFileType() == ProjectType::Target::TargetFileType::macOSAppex
|| target->type == ProjectType::Target::Type::AggregateTarget
|| target->type == ProjectType::Target::Type::AudioUnitv3PlugIn)
|| target->type == ProjectType::Target::Type::AggregateTarget
|| target->type == ProjectType::Target::Type::AudioUnitv3PlugIn)
continue;
auto targetAttributes = target->getTargetSettings (config);
@ -708,7 +708,7 @@ private:
continue;
if (target->type == ProjectType::Target::Type::AudioUnitPlugIn)
out << "find_program (RC_COMPILER Rez NO_DEFAULT_PATHS PATHS /Applications/Xcode.app/Contents/Developer/usr/bin)" << newLine
out << "find_program (RC_COMPILER Rez NO_DEFAULT_PATHS PATHS \"/Applications/Xcode.app/Contents/Developer/usr/bin\")" << newLine
<< "if (NOT RC_COMPILER)" << newLine
<< " message (WARNING \"failed to find Rez; older resource-based AU plug-ins may not work correctly\")" << newLine
<< "endif (NOT RC_COMPILER)" << newLine << newLine;
@ -919,9 +919,12 @@ private:
auto resSourcesVar = targetVarName + "_REZ_SOURCES";
auto resOutputVar = targetVarName + "_REZ_OUTPUT";
auto sdkVersion = config.getOSXSDKVersionString().upToFirstOccurrenceOf (" ", false, false);
auto sysroot = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" + sdkVersion + ".sdk";
out << "if (RC_COMPILER)" << newLine
<< " set (" << resSourcesVar << newLine
<< " \"" << item.determineGroupFolder().getFullPathName() + "/include_juce_audio_plugin_client_AU.r\"" << newLine
<< " " << item.determineGroupFolder().getChildFile ("include_juce_audio_plugin_client_AU.r").getFullPathName().quoted() << newLine
<< " )" << newLine
<< " set (" << resOutputVar << " \"${CMAKE_CURRENT_BINARY_DIR}/" << binaryName << ".rsrc\")" << newLine
<< " target_sources (" << targetVarName << " PRIVATE" << newLine
@ -930,7 +933,8 @@ private:
<< " )" << newLine
<< " execute_process (COMMAND" << newLine
<< " ${RC_COMPILER}" << newLine
<< " " << rezFlags.unquoted().removeCharacters ("\\") << newLine;
<< " " << rezFlags.unquoted().removeCharacters ("\\") << newLine
<< " -isysroot " << sysroot.quoted() << newLine;
for (auto& path : headerSearchPaths)
{