From f8b2ac1befd9379cdb2fb0dabe8142d74c801818 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 15 Sep 2013 12:09:53 +0200 Subject: Use libpng from sourcetree instead of the one supplied by the OS. --- plugingui/Makefile.am.plugingui | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'plugingui/Makefile.am.plugingui') diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui index 4679eb0..84f1979 100644 --- a/plugingui/Makefile.am.plugingui +++ b/plugingui/Makefile.am.plugingui @@ -29,8 +29,18 @@ PLUGIN_GUI_SOURCES = \ $(top_srcdir)/plugingui/progressbar.cc \ $(top_srcdir)/plugingui/verticalline.cc \ $(top_srcdir)/plugingui/resource.cc \ - $(top_srcdir)/plugingui/resource_data.cc + $(top_srcdir)/plugingui/resource_data.cc \ + $(top_srcdir)/plugingui/png/png.c \ + $(top_srcdir)/plugingui/png/pngerror.c \ + $(top_srcdir)/plugingui/png/pngmem.c \ + $(top_srcdir)/plugingui/png/pngread.c \ + $(top_srcdir)/plugingui/png/pngget.c \ + $(top_srcdir)/plugingui/png/pngtrans.c \ + $(top_srcdir)/plugingui/png/pngrutil.c \ + $(top_srcdir)/plugingui/png/pngset.c \ + $(top_srcdir)/plugingui/png/pngrio.c \ + $(top_srcdir)/plugingui/png/pngrtran.c -PLUGIN_GUI_LIBS = $(X11_LIBS) $(PTHREAD_LIBS) +PLUGIN_GUI_LIBS = $(X11_LIBS) $(PTHREAD_LIBS) -lz -PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PNG_LIBS) $(PTHREAD_CFLAGS) +PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) -- cgit v1.2.3