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

Multiple definition error at make
This commit is contained in:
Nobuhiro Hatano 2023-06-07 23:21:39 +09:00 committed by GitHub
commit 2e17ed5e27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 3 additions and 1 deletions

0
AUTHORS Executable file → Normal file
View File

0
CHANGELOG Executable file → Normal file
View File

0
COPYING Executable file → Normal file
View File

0
README Executable file → Normal file
View File

0
SAMPLE_PROGRAMS Executable file → Normal file
View File

0
src/keyboard.c Executable file → Normal file
View File

0
src/keyboard.h Executable file → Normal file
View File

0
src/m6502.c Executable file → Normal file
View File

0
src/m6502.h Executable file → Normal file
View File

0
src/main.c Executable file → Normal file
View File

0
src/makefile Executable file → Normal file
View File

0
src/memory.c Executable file → Normal file
View File

0
src/memory.h Executable file → Normal file
View File

0
src/msgbuf.c Executable file → Normal file
View File

0
src/msgbuf.h Executable file → Normal file
View File

0
src/pia6820.c Executable file → Normal file
View File

0
src/pia6820.h Executable file → Normal file
View File

2
src/screen.c Executable file → Normal file
View File

@ -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);

2
src/screen.h Executable file → Normal file
View File

@ -25,5 +25,5 @@ void outputDsp(unsigned char dsp);
char getch_screen(void);
void select_screen(void);
int nrow, ncol;
extern int nrow, ncol;