From 8622cf0b3515915629265b97e9d41d4ae27bdead Mon Sep 17 00:00:00 2001 From: Allanis Date: Sun, 9 Mar 2014 21:28:47 +0000 Subject: [PATCH] [Change] Handle libpng dependancy a little better. --- README | 2 ++ bin/Makefile | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README b/README index 8d975c8..1173354 100644 --- a/README +++ b/README @@ -43,6 +43,7 @@ Dependencies: -- libgl1-mesa-dri -- libxml2 -- libfreetype6 + -- libpng12-0 -- Source: -- libsdl1.2-dev @@ -51,6 +52,7 @@ Dependencies: -- libgl1-mesa-dev -- libxml2-dev -- libfreetype6-dev + -- libpng12-dev Instructions: diff --git a/bin/Makefile b/bin/Makefile index 51a96a5..3c97150 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -28,8 +28,9 @@ CLUA := -I../lib/lua CSDL := $(shell sdl-config --cflags) CXML := $(shell xml2-config --cflags) CTTF := $(shell freetype-config --cflags) +CPNG := $(shell pkg-config libpng --cflags) CGL := -CFLAGS := $(CLUA) $(CSDL) $(CXML) $(CTTF) $(CGL) $(VERSION) -D$(OS) +CFLAGS := $(CLUA) $(CSDL) $(CXML) $(CTTF) $(CPNG) $(CGL) $(VERSION) -D$(OS) # OS Stuff. ifeq ($(OS),LINUX) @@ -60,9 +61,9 @@ LDLUA := ../lib/lua/liblua.a LDSDL := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer LDXML := $(shell xml2-config --libs) LDTTF := $(shell freetype-config --libs) +CPNG := $(shell pkg-config libpng --libs) LDGL := -lGL -LDPNG := -lpng -LDFLAGS := -lm $(LDLUA) $(LDSDL) $(LDXML) $(LDTTF) $(LDGL) $(LDPNG) +LDFLAGS := -lm $(LDLUA) $(LDSDL) $(LDXML) $(LDTTF) $(CPNG) $(LDGL) $(LDPNG) # This is just for gstat to run some analysis on performance. ifdef DEBUG