projects
/
dcpu16
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge
[dcpu16]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 263c8e33bff371276c1e1a6af1ff872a98a8551b..1ecac46d40f73f94e96b87c3c86e1bea893befdc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-4,30
+4,36
@@
ifeq "$(origin CC)" "default"
CC = clang
endif
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 \
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 += -DDEBUG
-CPPFLAGS += -DHAVE_LIBPNG -I/usr/X11/include/
CFLAGS = -g -Wall -Wextra -pedantic -std=c99
CFLAGS = -g -Wall -Wextra -pedantic -std=c99
-LDFLAGS += -lreadline
-LDFLAGS += -L/usr/X11/lib -lpng
UNAME := $(shell uname)
ifeq ($(UNAME),Darwin)
CPPFLAGS += -DHAVE_FUNOPEN
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
# linux needs _XOPEN_SOURCE=600 (provided by _GNU_SOURCE) for getopt and strdup
CPPFLAGS += -DHAVE_FOPENCOOKIE -D_GNU_SOURCE
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
+# linux needs librt for clock_gettime
+LDFLAGS += -lrt
endif
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)
all: $(PROGRAMS)
@@
-40,7
+46,7
@@
depend: .depend
include .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
as-dcpu16: as-dcpu16.o dcpu16.o common.o