From 493d99837569ec5b903ddc38d46130e1d1741356 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 13 May 2012 07:02:13 +0000 Subject: [PATCH] Use pkg-config to detect libpng when building for unix, this helps with Debian package system. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1955 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index f3622251..3e4954b1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -342,11 +342,9 @@ endif # Compiles a regular linux executable for the native platform BIN = ../bin/grafx2 - COPT = -W -Wall -Wdeclaration-after-statement -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) $(LUACOPT) $(JOYCOPT) $(VKEYCOPT) -O$(OPTIM) -I/usr/local/include/libpng - LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng $(LUALOPT) -lm - # Use gcc for compiling. Use ncc to build a callgraph and analyze the code. + COPT = -W -Wall -Wdeclaration-after-statement -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) $(LUACOPT) $(JOYCOPT) $(VKEYCOPT) -O$(OPTIM) `pkg-config --cflags libpng` + LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) `pkg-config --libs libpng` $(LUALOPT) -lm CC = gcc - #CC = nccgen -ncgcc -ncld -ncfabs OBJDIR = ../obj/unix X11LOPT = -lX11 endif