diff --git a/RedPandaIDE/compiler/compilerinfo.cpp b/RedPandaIDE/compiler/compilerinfo.cpp index dceb9da6..1d0c79b8 100644 --- a/RedPandaIDE/compiler/compilerinfo.cpp +++ b/RedPandaIDE/compiler/compilerinfo.cpp @@ -427,7 +427,7 @@ void SDCCCompilerInfo::prepareCompilerOptions() sl.append(QPair("Padauk processors with 15 bit wide program memory","pdk15")); sl.append(QPair("Padauk processors with 15 bit wide program memory","pdk15")); sl.append(QPair("Padauk processors with 15 bit wide program memory","pdk15")); - addOption(SDCC_CMD_OPT_PROCESSOR, QObject::tr("Processor (-m)"), groupName, true, true, false, "-m", sl); + addOption(SDCC_CMD_OPT_PROCESSOR, QObject::tr("Processor (-m)"), groupName, true, false, false, "-m", sl); // C++ Language Standards sl.clear(); @@ -441,6 +441,6 @@ void SDCCCompilerInfo::prepareCompilerOptions() sl.append(QPair("SDCC C11","sdcc11")); sl.append(QPair("SDCC C17","sdcc17")); sl.append(QPair("SDCC C2x","sdcc2x")); - addOption(SDCC_CMD_OPT_STD, QObject::tr("Language standard (-std)"), groupName, false, true, false, "-std-", sl); + addOption(SDCC_CMD_OPT_STD, QObject::tr("Language standard (--std)"), groupName, true, false, false, "--std-", sl); } #endif diff --git a/RedPandaIDE/compiler/sdccfilecompiler.cpp b/RedPandaIDE/compiler/sdccfilecompiler.cpp index dfb6fcb0..aef8a334 100644 --- a/RedPandaIDE/compiler/sdccfilecompiler.cpp +++ b/RedPandaIDE/compiler/sdccfilecompiler.cpp @@ -92,6 +92,9 @@ bool SDCCFileCompiler::prepareForCompile() mExtraOutputFilesList.append(""); } + mArguments += getCCompileArguments(false); + mArguments += getCIncludeArguments(); + mArguments += getProjectIncludeArguments(); QString strFileType = "C"; mCompiler = compilerSet()->CCompiler(); diff --git a/RedPandaIDE/settingsdialog/editorfontwidget.ui b/RedPandaIDE/settingsdialog/editorfontwidget.ui index db31a89d..469ed77d 100644 --- a/RedPandaIDE/settingsdialog/editorfontwidget.ui +++ b/RedPandaIDE/settingsdialog/editorfontwidget.ui @@ -7,7 +7,7 @@ 0 0 876 - 643 + 713 @@ -39,7 +39,14 @@ 0 - + + + false + + + QComboBox::AdjustToContents + + @@ -184,7 +191,7 @@ false - QComboBox::AdjustToContentsOnFirstShow + QComboBox::AdjustToContents QFontComboBox::AllFonts @@ -569,7 +576,7 @@ false - QComboBox::AdjustToContentsOnFirstShow + QComboBox::AdjustToContents QFontComboBox::AllFonts