diff options
| -rw-r--r-- | src/app/qbs-setup-toolchains/iarewprobe.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp index e4d62136c..4f87590a6 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -65,7 +65,7 @@ static QStringList knownIarCompilerNames() QStringLiteral("iccavr32"), QStringLiteral("iccsh"), QStringLiteral("iccriscv"), QStringLiteral("icccf"), QStringLiteral("iccm32c"), QStringLiteral("iccr32c"), - QStringLiteral("iccm16c")}; + QStringLiteral("iccm16c"), QStringLiteral("icccr16c")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -105,6 +105,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("r32c"); if (baseName == QLatin1String("iccm16c")) return QStringLiteral("m16c"); + if (baseName == QLatin1String("icccr16c")) + return QStringLiteral("cr16"); return {}; } @@ -187,7 +189,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("m68k") || arch == QLatin1String("m32c") || arch == QLatin1String("r32c") - || arch == QLatin1String("m16c")) { + || arch == QLatin1String("m16c") + || arch == QLatin1String("rc16")) { return Version{verCode / 100, verCode % 100}; } @@ -245,6 +248,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWM32C"), QStringLiteral("/m32c/bin/iccm32c.exe")}, {QStringLiteral("EWR32C"), QStringLiteral("/r32c/bin/iccr32c.exe")}, {QStringLiteral("EWM16C"), QStringLiteral("/m16c/bin/iccm16c.exe")}, + {QStringLiteral("EWCR16C"), QStringLiteral("/cr16c/bin/icccr16c.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |