Skip to content

Commit b847e4a

Browse files
committed
Remove -g NASM flag which prevented debugging when modern NASM used
1 parent 5615d36 commit b847e4a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

help.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ <H4>Дополнительные конфигурации ассемблеров
250250
<TBODY>
251251
<TR>
252252
<TD>NASM</TD>
253-
<TD>-g -f {win32|win64|elf} $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$</TD>
253+
<TD>-f {win32|win64|elf} $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$</TD>
254254
<TD>{gcc|ld|golink}</TD>
255255
</TR>
256256
<TR>

helpENG.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ <H4>Assembler additional configurations:</H4>
221221
<TBODY>
222222
<TR>
223223
<TD>NASM</TD>
224-
<TD>-g -f {win32|win64|elf} $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$</TD>
224+
<TD>-f {win32|win64|elf} $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$</TD>
225225
<TD>{gcc|ld|golink}</TD>
226226
</TR>
227227
<TR>

mainwindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,9 +849,9 @@ void MainWindow::buildProgram(bool debugMode)
849849
if (settings.contains("assemblerpath"))
850850
assemblerPath = settings.value("assemblerpath").toString();
851851
#ifdef Q_OS_WIN32
852-
QString assemblerOptions = "-g -f win32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
852+
QString assemblerOptions = "-f win32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
853853
#else
854-
QString assemblerOptions = "-g -f elf32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
854+
QString assemblerOptions = "-f elf32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
855855
#endif
856856
if (settings.contains("assemblyoptions"))
857857
assemblerOptions = settings.value("assemblyoptions").toString();

nasm.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,14 @@ QString NASM::getAssemblerOptions()
198198
QString options;
199199
#ifdef Q_OS_WIN32
200200
if (isx86())
201-
options = "-g -f win32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
201+
options = "-f win32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
202202
else
203-
options = "-g -f win64 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
203+
options = "-f win64 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
204204
#else
205205
if (isx86())
206-
options = "-g -f elf32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
206+
options = "-f elf32 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
207207
else
208-
options = "-g -f elf64 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
208+
options = "-f elf64 $SOURCE$ -l $LSTOUTPUT$ -o $PROGRAM.OBJ$";
209209
#endif
210210
return options;
211211
}

0 commit comments

Comments
 (0)