X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=Makefile;h=4dcde613241b5595f8829ebf4fe6f0e34138e8c8;hb=33efa05d43acf927c97daab10c00d1cbc2a7b9f6;hp=263c8e33bff371276c1e1a6af1ff872a98a8551b;hpb=0a1b4588f79e3719af9431a98da44350030df754;p=dcpu16

diff --git a/Makefile b/Makefile
index 263c8e3..4dcde61 100644
--- a/Makefile
+++ b/Makefile
@@ -4,21 +4,25 @@
 ifeq "$(origin CC)" "default"
 CC = clang
 endif
+ifeq ($(CC),gcc)
+CPPFLAGS += -DWANT_VARIADIC_VOIDP_CAST
+endif
+
 
 PROGRAMS = as-dcpu16 vm-dcpu16
 SOURCES = common.c dcpu16.c as-dcpu16.c vm-dcpu16.c \
-		  hw_clock.c hw_keyboard.c hw_lem1802.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
-LDFLAGS += -lreadline
-LDFLAGS += -L/usr/X11/lib -lpng
 
 UNAME := $(shell uname)
 ifeq ($(UNAME),Darwin)
 CPPFLAGS += -DHAVE_FUNOPEN
+# libpng from system x11, libvncserver from macports
+CPPFLAGS += -I/usr/X11/include -I/opt/local/include
+LDFLAGS += -L/usr/X11/lib -L/opt/local/lib
 endif
 ifeq ($(UNAME),Linux)
 # linux needs _GNU_SOURCE for fopencookie
@@ -26,8 +30,8 @@ ifeq ($(UNAME),Linux)
 CPPFLAGS += -DHAVE_FOPENCOOKIE -D_GNU_SOURCE
 endif
 
-CPPFLAGS += -DHAVE_LIBVNCSERVER -I/opt/local/include
-LDFLAGS += -L/opt/local/lib -lvncserver
+CPPFLAGS += -DHAVE_LIBVNCSERVER -DHAVE_LIBPNG
+LDFLAGS += -lvncserver -lpng -lreadline
 
 all:	$(PROGRAMS)
 
@@ -40,7 +44,7 @@ depend:	.depend
 include .depend
 
 
-vm-dcpu16:	vm-dcpu16.o dcpu16.o common.o hw_clock.o hw_keyboard.o hw_lem1802.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 dcpu16.o common.o