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

Projucer: Fixed a bug when setting the Makefile exporter architecture to <None>

Browse source
This commit is contained in:
ed 2019-02-08 14:54:13 +00:00
parent 62958a79ea
commit 49359dfe34
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
View file

@ -48,8 +48,8 @@ protected:
addGCCOptimisationProperty (props); addGCCOptimisationProperty (props);
props.add (new ChoicePropertyComponent (architectureTypeValue, "Architecture", props.add (new ChoicePropertyComponent (architectureTypeValue, "Architecture",
{ "<None>", "Native", "32-bit (-m32)", "64-bit (-m64)", "ARM v6", "ARM v7" }, { "<None>", "Native", "32-bit (-m32)", "64-bit (-m64)", "ARM v6", "ARM v7" },
{ { String() } , "-march=native", "-m32", "-m64", "-march=armv6", "-march=armv7" }), { "none" , "-march=native", "-m32", "-m64", "-march=armv6", "-march=armv7" }),
"Specifies the 32/64-bit architecture to use."); "Specifies the 32/64-bit architecture to use.");
} }
@ -70,7 +70,15 @@ protected:
return "${JUCE_ARCH_LABEL}"; return "${JUCE_ARCH_LABEL}";
} }
String getArchitectureTypeString() const { return architectureTypeValue.get(); } String getArchitectureTypeString() const
{
auto archString = architectureTypeValue.get();
if (archString == "none")
return {};
return archString;
}
//============================================================================== //==============================================================================
ValueWithDefault architectureTypeValue; ValueWithDefault architectureTypeValue;