From b1cd30842e26255fb5edc3426e97ddb054aa1229 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 23 Dec 2014 10:06:12 +0000 Subject: [PATCH] Introjucer: added an option in linux to avoid setting the -march flag. --- .../Source/Project Saving/jucer_ProjectExport_Make.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h index adcde2aa89..846a28fe44 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h @@ -82,13 +82,13 @@ protected: setValueIfVoid (getLibrarySearchPathValue(), "/usr/X11R6/lib/"); } - Value getArchitectureType() { return getValue (Ids::linuxArchitecture); } - String getArchitectureTypeString() const { return config [Ids::linuxArchitecture]; } + Value getArchitectureType() { return getValue (Ids::linuxArchitecture); } + var getArchitectureTypeVar() const { return config [Ids::linuxArchitecture]; } void createConfigProperties (PropertyListBuilder& props) override { - static const char* const archNames[] = { "(Default)", "32-bit (-m32)", "64-bit (-m64)", "ARM v6", "ARM v7" }; - const var archFlags[] = { var(), "-m32", "-m64", "-march=armv6", "-march=armv7" }; + static const char* const archNames[] = { "(Default)", "", "32-bit (-m32)", "64-bit (-m64)", "ARM v6", "ARM v7" }; + const var archFlags[] = { var(), var (String()), "-m32", "-m64", "-march=armv6", "-march=armv7" }; props.add (new ChoicePropertyComponent (getArchitectureType(), "Architecture", StringArray (archNames, numElementsInArray (archNames)), @@ -323,8 +323,8 @@ private: String getArchFlags (const BuildConfiguration& config) const { if (const MakeBuildConfiguration* makeConfig = dynamic_cast (&config)) - if (makeConfig->getArchitectureTypeString().isNotEmpty()) - return makeConfig->getArchitectureTypeString(); + if (! makeConfig->getArchitectureTypeVar().isVoid()) + return makeConfig->getArchitectureTypeVar(); return "-march=native"; }