aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2016-02-21 18:58:56 -0500
committerB. Watson <yalhcru@gmail.com>2016-02-21 18:58:56 -0500
commit1d8677e2c37de359af8a717d715373677e23d62d (patch)
tree7db7258f8ac87d94909d340d30e234dfe8e5f2be
parenta4a884600888e5e2e6b5231c2840c01b44eae644 (diff)
downloadtaipan-1d8677e2c37de359af8a717d715373677e23d62d.tar.gz
fix warning in textcomp, add messages.c as taimain.xex dependency
-rw-r--r--.gitignore1
-rw-r--r--Makefile4
-rw-r--r--textcomp.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index eaca205..392f6ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+messages.c
msg.out
msg.tmp
textcomp
diff --git a/Makefile b/Makefile
index 27ffb7e..78826dd 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,7 @@ help.dat: help.txt text2screen.pl
# The main executable. All the C and asm code goes here, except the init
# segment in newtitle.s.
-taimain.xex: $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC) $(TAIMAIN_HDRS) $(BIGNUM_SRC) $(BIGNUM_HDRS) $(TAIMAIN_LIBS)
+taimain.xex: $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC) $(TAIMAIN_HDRS) $(BIGNUM_SRC) $(BIGNUM_HDRS) $(TAIMAIN_LIBS) messages.c
cl65 -m taipan.map $(CFLAGS) $(BIGNUM_CFLAGS) -o taimain.xex $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC) $(BIGNUM_SRC) $(TAIMAIN_LIBS)
#cl65 --mapfile taipan.map $(CFLAGS) -o taimain.xex taipan.c sounds.c rand.s draw_lorcha.s timed_getch.s jsleep.s portstat.s console.s
@@ -383,7 +383,7 @@ testcart: clean cart
# Obligatory clean and distclean rules.
clean:
- rm -f *.o *.lst convfont mkcart gzip2deflate *.xex AUTORUN.SYS taipan.atr dos2.atr mydos.atr fenders.atr ver.dat help.dat tags cartmsg.dat splitrom.raw.* taipan.rom taipan.cart bank[0-9] fill256 blankbank romable_taimain.raw splitrom.raw.* comptitle.s comptitle.dat conio/*.o conio/*.lib
+ rm -f *.o *.lst convfont mkcart gzip2deflate *.xex AUTORUN.SYS taipan.atr dos2.atr mydos.atr fenders.atr ver.dat help.dat tags cartmsg.dat splitrom.raw.* taipan.rom taipan.cart bank[0-9] fill256 blankbank romable_taimain.raw splitrom.raw.* comptitle.s comptitle.dat conio/*.o conio/*.lib messages.c textcomp
distclean: clean
rm -f *~ core .*.swp 1.* 2.* 1 2 3 map map.* *.map a b c foo bar baz
diff --git a/textcomp.c b/textcomp.c
index f82a91c..1ff769f 100644
--- a/textcomp.c
+++ b/textcomp.c
@@ -78,8 +78,9 @@ int getcode(int c) {
default:
fprintf(stderr, "unhandled ASCII code %d\n", c);
exit(1);
- break;
}
+
+ return 0; /* never executes, shut gcc -Wall up */
}
void appendbit(unsigned char b) {