summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames <git@panaceas.org>2014-05-05 17:55:23 +0100
committerJames <git@panaceas.org>2014-05-05 17:55:23 +0100
commit1e63aa05fa7fcc55af89cc9606b1143fb0a6ca8c (patch)
treeb157d203a2e691d105b7012cd6711591502c656e
parent363a3bbdcf252637de380fae2e06fd05d748f14b (diff)
downloadkmd_usb-1e63aa05fa7fcc55af89cc9606b1143fb0a6ca8c.tar.gz
kmd_usb-1e63aa05fa7fcc55af89cc9606b1143fb0a6ca8c.tar.bz2
kmd_usb-1e63aa05fa7fcc55af89cc9606b1143fb0a6ca8c.zip
protos
-rw-r--r--Makefile7
-rw-r--r--prototypes.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 76953c5..64995ab 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,13 @@ CSRCS=kmd.c status.c lcd.c input.c dispatch.c output.c map.c layout.c video_swit
WHERE=$(shell hostname | sed -e 's/^.*medaka.james.local/BROMIUM/g' -e 's/^.*panaceas.*/HOME/g' )
-CFLAGS=-g -Wall -D${WHERE} -Wno-unused
+CPPFLAGS=-D${WHERE}
+CFLAGS=-g -Wall -Wno-unused
all: kmd
%.o: %.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $^
+ $(CC) ${CPPFLAGS} $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $^
OBJS=${CSRCS:%.c=%.o}
@@ -26,7 +27,7 @@ clean:
protos:
echo > prototypes.h
- cproto -e -v ${CSRCS} >> prototypes.tmp
+ cproto -e -v ${CPPFLAGS} ${CSRCS} >> prototypes.tmp
mv -f prototypes.tmp prototypes.h
install: kmd
diff --git a/prototypes.h b/prototypes.h
index b696210..695315d 100644
--- a/prototypes.h
+++ b/prototypes.h
@@ -32,6 +32,7 @@ extern void send_mouse_event(int computer, int x, int y, int s, int l, int m, in
extern void scan_output_devs(int init);
extern void output_reset(void);
/* map.c */
+extern void map_output(int *computer, int *x, int *y);
extern int map_grace_left(int computer);
extern int map_grace_right(int computer);
extern int map_switch_left(int *cc);
@@ -40,6 +41,7 @@ extern int map_init(void);
/* layout.c */
extern int layout_computer_to_console(int computer);
extern int layout_console_to_computer(int console);
+extern int layout_possible(int console, int computer);
extern void layout_map(int console, int computer);
extern void layout_status(int active_computer);
extern void layout_toggle_lock(int computer);