Merge pull request #5 from nobuh/msgbuf-format-not-a-string

Msgbuf format not a string
Remove install instruction for cygwin
2023-06-07 23:34:27 +09:00 · 2023-06-07 23:30:49 +09:00 · 2023-06-07 23:24:44 +09:00 · 2023-06-07 23:21:39 +09:00 · 2023-06-07 23:08:33 +09:00 · 2023-06-07 15:17:25 +09:00
19 changed files with 10 additions and 12 deletions
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/16
+++ b/16
@ -1,21 +1,17 @@
 napple1 is an Apple 1 emulator using ncurses, ported from the SDL version 
 Pom1 emulafor. If you have some questions, please report it as an issue. 

-How to install on cygwin
-=========================
-0. Setup cygwin (base) and make, gcc4, libncurses-dev
-   and follow Linux procedure. 
+How to install on Ubuntu (ex. Ubuntu 22.04)
+===========================================
+1. sudo apt install make gcc libncurses-dev

-How to install on Linux
-========================
-1. Download latest source package nappple1-<n>.<n>.tar.gz 
-   and extract it.
+2. git clone https://github.com/nobuh/napple1.git

-2. Build
+3. Build
 	cd napple1/src
 	make
 	cd ..
-3. Run 
+4. Run 
 	./napple1

 ROM Directory
--- 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
@ -45,7 +45,7 @@ void print_msgbuf(char *s)
 			"%-40s", 
 			s);
 	werase(msgbuf);
-	wprintw(msgbuf, msg);
+	wprintw(msgbuf, "%s", msg);
 	wrefresh(msgbuf);
 }

--- 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;
Author	SHA1	Message	Date
Nobuhiro Hatano	c337c22071	Merge pull request #5 from nobuh/msgbuf-format-not-a-string Msgbuf format not a string	2023-06-07 23:34:27 +09:00
nobuh	e36276fce7	Remove install instruction for cygwin	2023-06-07 23:30:49 +09:00
nobuh	c0f43127cc	msgbuf.c format not a string warning during make	2023-06-07 23:24:44 +09:00
Nobuhiro Hatano	2e17ed5e27	Merge pull request #4 from nobuh/multiple-difinition-error Multiple definition error at make	2023-06-07 23:21:39 +09:00
nobuh	d47be2dd9e	fix make: multiple definition of nrow and ncol make fail by the error /usr/bin/ld: main.o:(.bss+0x0): multiple definition of `nrow'; memory.o:(.bss+0x0): first defined here /usr/bin/ld: main.o:(.bss+0x4): multiple definition of `ncol'; memory.o:(.bss+0x4): first defined here fix definition of the global variables nrow and ncol.	2023-06-07 23:08:33 +09:00
nobuh	4be07cb2ee	chmod -x on src files	2023-06-07 15:17:25 +09:00