From: andy Date: Mon, 22 Oct 2012 03:24:30 +0000 (+1300) Subject: More work. X-Git-Url: https://pd.if.org/git/?p=pd_readline;a=commitdiff_plain;h=3345932d0ab453d9ca85814fde1fe618bb36570f More work. --- diff --git a/Makefile b/Makefile index 514bca2..1e008fd 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CC = gcc -CFLAGS = -O2 -Wall -g $(DEFINES) +CFLAGS = -O2 -Wall -g -c $(DEFINES) # INCPATH = -I. @@ -13,7 +13,7 @@ INCPATH = . LDFLAGS = $(SYSLDFLAGS) $(MYLDFLAGS) -LIBS = -l$(SYSLIBS) $(MYLIBS) +# LIBS = -l$(SYSLIBS) $(MYLIBS) RM = rm -f @@ -27,15 +27,15 @@ OBJECTS = keyhandler.o funcs.o history.o pd_readline.o pd_readline: $(OBJECTS) $(CC) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBS) +keyhandler.o: $(HEADERS) +funcs.o: $(HEADERS) +history.o: $(HEADERS) pd_readline.o: $(HEADERS) -#keyhandler.o: $(HEADERS) -#funcs.o: $(HEADERS) -#history.o: $(HEADERS) .PHONY: clean clean: - rm *.o pd_readline + rm *.o diff --git a/funcs.c b/funcs.c index 7444e66..e259f16 100644 --- a/funcs.c +++ b/funcs.c @@ -11,7 +11,7 @@ #include #include #include - +#include "pd_readline.h" /* Move up in history list. */ diff --git a/history.c b/history.c index f8a0d25..f84ec24 100644 --- a/history.c +++ b/history.c @@ -6,6 +6,9 @@ /* "Share and enjoy...." ;) */ /* See the UNLICENSE file for details. */ +#include +#include +#include /* Helper function, to let us see if a file */ diff --git a/keyhandler.c b/keyhandler.c index 6cbe358..80ad5e5 100644 --- a/keyhandler.c +++ b/keyhandler.c @@ -12,6 +12,7 @@ #include #include #include +#include "pd_readline.h" /* This implementation of getch() is from here - */ @@ -58,16 +59,16 @@ char getche(void) { -int keyhandler(void) +void keyhandler(void) { int i = getch(); switch(i) { - case (27): escape() ; - case (33): dosomething(); - case (42): something(); - default: stuff(); + case (27): puts("1"); /* escape() ; */ + case (33): puts("2"); /* dosomething(); */ + case (42): puts("3"); /* something(); */ + default: puts("4"); /* stuff(); */ } } diff --git a/pd_readline.c b/pd_readline.c index 033dfc1..756e5dd 100644 --- a/pd_readline.c +++ b/pd_readline.c @@ -23,7 +23,7 @@ /* Ctrl-C and Ctrl-V. */ -#include "pd_readline.h" +#include "pd_readline.h" int main(void) diff --git a/pd_readline.h b/pd_readline.h index 021933e..f05ec8e 100644 --- a/pd_readline.h +++ b/pd_readline.h @@ -28,7 +28,7 @@ int esc(int i); /* Other funcs. */ void readhistory(char *fname); -int keyhandler(void); +void keyhandler(void);