projects
/
dcpu16
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a9cc197
)
just rearranging Makefile for linux
author
Justin Wind
<justin.wind@gmail.com>
Wed, 16 May 2012 02:58:41 +0000
(19:58 -0700)
committer
Justin Wind
<justin.wind@gmail.com>
Wed, 16 May 2012 02:58:41 +0000
(19:58 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 2560edffac3bade1fde45492e063c4862c7cf018..0593b49d6028abf71f612d4c2cb2c388140dd3f3 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,14
+11,14
@@
SOURCES = common.c dcpu16.c as-dcpu16.c vm-dcpu16.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
endif
ifeq ($(UNAME),Linux)
# linux needs _GNU_SOURCE for fopencookie
@@
-26,8
+26,8
@@
ifeq ($(UNAME),Linux)
CPPFLAGS += -DHAVE_FOPENCOOKIE -D_GNU_SOURCE
endif
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)
all: $(PROGRAMS)