From: Justin Wind <justin.wind@gmail.com>
Date: Wed, 16 May 2012 02:58:41 +0000 (-0700)
Subject: just rearranging Makefile for linux
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=38f0ff1acd36de903795788645a4eac405a15009;p=dcpu16

just rearranging Makefile for linux
---

diff --git a/Makefile b/Makefile
index 2560edf..0593b49 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,14 @@ SOURCES = common.c dcpu16.c as-dcpu16.c vm-dcpu16.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 +26,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)