Merge pull request #4 from nobuh/multiple-difinition-error

Multiple definition error at make
2024-11-28 09:49:52 +00:00 · 2023-06-07 23:21:39 +09:00 · 2023-06-07 23:21:39 +09:00 · 2e17ed5e27
commit 2e17ed5e27
parent b08c1e6ac4 d47be2dd9e
19 changed files with 3 additions and 1 deletions
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/src/keyboard.c
+++ b/src/keyboard.c
--- a/src/keyboard.h
+++ b/src/keyboard.h
--- a/src/m6502.c
+++ b/src/m6502.c
--- a/src/m6502.h
+++ b/src/m6502.h
--- a/src/main.c
+++ b/src/main.c
--- a/src/makefile
+++ b/src/makefile
--- a/src/memory.c
+++ b/src/memory.c
--- a/src/memory.h
+++ b/src/memory.h
--- a/src/msgbuf.c
+++ b/src/msgbuf.c
--- a/src/msgbuf.h
+++ b/src/msgbuf.h
--- a/src/pia6820.c
+++ b/src/pia6820.c
--- a/src/pia6820.h
+++ b/src/pia6820.h
--- a/src/screen.c
+++ b/src/screen.c
@ -36,6 +36,8 @@ static int indexX, indexY;
 static WINDOW *screen;
 static long long interval_start; /* interval start time in u sec */

+int nrow, ncol;
+
 char getch_screen(void)
 {
 	return (char)wgetch(screen);
--- a/src/screen.h
+++ b/src/screen.h
@ -25,5 +25,5 @@ void outputDsp(unsigned char dsp);
 char getch_screen(void);
 void select_screen(void);

-int nrow, ncol;
+extern int nrow, ncol;