X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=Makefile;h=2560edffac3bade1fde45492e063c4862c7cf018;hb=74629db149379f2d67cd2b1cf575b46ef6e317b6;hp=70445ff8f27955f86faadebf6200ff1805748700;hpb=4185a67f55fb99f34f013b939a8ef9e13454c1e5;p=dcpu16

diff --git a/Makefile b/Makefile
index 70445ff..2560edf 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,10 @@ CC = clang
 endif
 
 PROGRAMS = as-dcpu16 vm-dcpu16
-SOURCES = common.c dcpu16.c as-dcpu16.c vm-dcpu16.c display.c
+SOURCES = common.c dcpu16.c as-dcpu16.c vm-dcpu16.c \
+		  hw_clock.c hw_keyboard.c hw_lem1802.c hw_spc2000.c
+
+CPPFLAGS += -DDEBUG
 
 CPPFLAGS += -DHAVE_LIBPNG -I/usr/X11/include/
 CFLAGS = -g -Wall -Wextra -pedantic -std=c99
@@ -18,9 +21,13 @@ ifeq ($(UNAME),Darwin)
 CPPFLAGS += -DHAVE_FUNOPEN
 endif
 ifeq ($(UNAME),Linux)
-CPPFLAGS += -DHAVE_FOPENCOOKIE -D_XOPEN_SOURCE=600
+# linux needs _GNU_SOURCE for fopencookie
+# linux needs _XOPEN_SOURCE=600 (provided by _GNU_SOURCE) for getopt and strdup
+CPPFLAGS += -DHAVE_FOPENCOOKIE -D_GNU_SOURCE
 endif
 
+CPPFLAGS += -DHAVE_LIBVNCSERVER -I/opt/local/include
+LDFLAGS += -L/opt/local/lib -lvncserver
 
 all:	$(PROGRAMS)
 
@@ -33,9 +40,9 @@ depend:	.depend
 include .depend
 
 
-vm-dcpu16:	vm-dcpu16.o dcpu16.o common.o display.o
+vm-dcpu16:	vm-dcpu16.o dcpu16.o common.o hw_clock.o hw_keyboard.o hw_lem1802.o hw_spc2000.o
 
-as-dcpu16:	as-dcpu16.o common.o
+as-dcpu16:	as-dcpu16.o dcpu16.o common.o
 
 clean:	
 	@rm -rf $(PROGRAMS) *.o *.dSYM .depend