further changes for v1.7: cpu fixes, support for 'hardware' devices, display to vnc

[dcpu16] / Makefile

diff --git a/Makefile b/Makefile
index 0da0a0e2778f7a2c0a9ff465c33154836bbabc02..263c8e33bff371276c1e1a6af1ff872a98a8551b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,28 @@ 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
 
-CPPFLAGS = -D_XOPEN_SOURCE=600
+CPPFLAGS += -DDEBUG
+
+CPPFLAGS += -DHAVE_LIBPNG -I/usr/X11/include/
 CFLAGS = -g -Wall -Wextra -pedantic -std=c99
-LDFLAGS = -lreadline
+LDFLAGS += -lreadline
+LDFLAGS += -L/usr/X11/lib -lpng
+
+UNAME := $(shell uname)
+ifeq ($(UNAME),Darwin)
+CPPFLAGS += -DHAVE_FUNOPEN
+endif
+ifeq ($(UNAME),Linux)
+# 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)
 
@@ -24,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
 
-as-dcpu16:     as-dcpu16.o common.o
+as-dcpu16:     as-dcpu16.o dcpu16.o common.o
 
 clean: 
        @rm -rf $(PROGRAMS) *.o *.dSYM .depend