Skip to content

Commit 9a38958

Browse files
committed
Cleanup, compiler warning, fixes, and linker hardening
1 parent c1986b9 commit 9a38958

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed
File renamed without changes.

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ exec: info $(EXEC_DIR)/nqc$(EXEC_EXT)
210210

211211
$(EXEC_DIR)/nqc$(EXEC_EXT): compiler/parse.cpp $(OBJ)
212212
$(MKDIR) $(dir $@)
213-
$(CXX) $(CFLAGS) $(CFLAGS_EXEC) -o $@ $(OBJ) $(LIBS)
213+
$(CXX) $(CFLAGS) $(CFLAGS_EXEC) -o $@ $(OBJ) $(LIBS) $(LDFLAGS)
214214

215215
#
216216
# Emscripten build for WebAssembly
@@ -322,7 +322,7 @@ install: all
322322
test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
323323
cp -r $(EXEC_DIR)/* $(DESTDIR)$(BINDIR)
324324
test -d $(DESTDIR)$(MANDIR) || mkdir -p $(DESTDIR)$(MANDIR)
325-
cp nqc-man-2.1r1-0.man $(DESTDIR)$(MANDIR)/nqc.$(MANEXT)
325+
cp nqc-man.man $(DESTDIR)$(MANDIR)/nqc.$(MANEXT)
326326

327327
#
328328
# Print some info about the environment

compiler/Error.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static const char *sErrorText[] = {
2424
"internal error",
2525
"%s",
2626
"unterminated #if/#ifdef/#ifndef",
27-
"%s without preceeding #if/#ifdef/#ifndef",
27+
"%s without preceding #if/#ifdef/#ifndef",
2828
"illegal preprocessor directive",
2929
"#include requires a filename",
3030
"could not open file %s",

compiler/rcx1.nqh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686

8787

8888
/**************************
89-
* ouput
89+
* output
9090
**************************/
9191

9292
// constants for selecting outputs
@@ -171,7 +171,7 @@
171171
// CM specific data sources
172172
#define TachoCount(n) @(0x50000 + (n)-1) // Use OUT_x as parameter
173173
#define TachoSpeed(n) @(0x60000 + (n)-1) // Use OUT_x as parameter
174-
#define ExternalMotorRunning() @(0x70002) // Refered in the SDK as MotorCurrent(2). Non zero if external motor running.
174+
#define ExternalMotorRunning() @(0x70002) // Referred in the SDK as MotorCurrent(2). Non zero if external motor running.
175175
#define AGC() @(0x100000) // Automatic Gain Control
176176
#endif
177177

mkdata/mkdata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using std::strcmp;
99
static const char *sTestArgs[] = {"mkdata", "-s", "fastdl.srec", "RCX_nub.h", "rcxNub" };
1010

1111

12-
int main(int argc, char **argv)
12+
int main(int argc, const char **argv)
1313
{
1414
FILE *src;
1515
FILE *dst;

nqc-man-2.1r1-0.man renamed to nqc-man.man

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ instead of to stderr.
5858
.TP
5959
\fB\-I\fR\fIpath\fR
6060
search \fIpath\fR for include files. Multiple directories should be
61-
seperated as normal for the platform (under Linux / Unix, that'd be "\fB\:\fR").
61+
separated as normal for the platform (under Linux / Unix, that'd be "\fB\:\fR").
6262
Can also be set with the NQC_INCLUDE environment variable.
6363
.TP
6464
\fB\-L\fR[\fIfilename\fR]
@@ -195,7 +195,7 @@ bytecode listing to the screen in human-readable format:
195195
.PP
196196
)
197197
.SH FILES
198-
Older versions of nqc required a seperate \fIrcx.nqh\fR or \fIrcx2.nqh\fR
198+
Older versions of nqc required a separate \fIrcx.nqh\fR or \fIrcx2.nqh\fR
199199
file. This is now integrated into the binary and no longer necessary,
200200
but for reference, \fIrcx2.nqh\fR is included with the package.
201201
(If you installed the RPM, try \fI/usr/doc/nqc-2.1.0/rcx2.nqh\fR).

0 commit comments

Comments
 (0)