rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:royqh1979/RedPanda-CPP

This commit is contained in:
Roy Qu 2023-02-12 18:14:02 +08:00
parent 02b64497d5 382da1d747
commit 5cc52ea9f9
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
RedPandaIDE/compiler/filecompiler.cpp
View File

@ -18,6 +18,7 @@
#include "utils.h"
#include "../mainwindow.h"
#include "compilermanager.h"
#include "qsynedit/syntaxer/asm.h"
#include <QFile>
#include <QFileInfo>
@ -126,6 +127,39 @@ bool FileCompiler::prepareForCompile()
if (!mOnlyCheckSyntax)
mArguments += getLibraryArguments(fileType);
if (fileType==FileType::GAS) {
bool hasStart=false;
QStringList lines=readFileToLines(mFilename);
QSynedit::ASMSyntaxer syntaxer;
syntaxer.resetState();
QString lastToken;
QString token;
QSynedit::PTokenAttribute attr;
for (int i=0;i<lines.count();i++) {
QString line=lines[i];
syntaxer.setLine(line,i+1);
lastToken="";
while(!syntaxer.eol()) {
token=syntaxer.getToken();
if (token==":" && lastToken=="_start") {
hasStart=true;
break;
}
attr = syntaxer.getTokenAttribute();
if (attr->tokenType() != QSynedit::TokenType::Space
&& attr->tokenType()!=QSynedit::TokenType::String
&& attr->tokenType()!=QSynedit::TokenType::Character)
lastToken=token;
syntaxer.next();
}
if (hasStart)
break;
}
if (hasStart) {
mArguments+=" -nostdlib";
}
}
if (!fileExists(mCompiler)) {
throw CompileError(
tr("The Compiler '%1' doesn't exists!").arg(mCompiler)

4
RedPandaIDE/compiler/projectcompiler.cpp
View File

@ -298,12 +298,8 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
}
#elif defined(Q_OS_LINUX)
asmFlags = "-f elf64";
if (mProject->getCompileOption(CC_CMD_OPT_DEBUG_INFO) == COMPILER_OPTION_ON)
asmFlags += " -g ";
#elif defined(Q_OS_MACOS)
asmFlags = "-f macho64";
if (mProject->getCompileOption(CC_CMD_OPT_DEBUG_INFO) == COMPILER_OPTION_ON)
asmFlags += " -g ";
#endif
writeln(file,"ASMFLAGS = " + asmFlags);
}