From f8539726368141f8b42c7817cfd59b4abfce33f3 Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Tue, 7 Apr 2009 14:50:25 -0400 Subject: [PATCH] [win32] Fix building with libpng and zlib Include zlib and libpng dependencies using something like '$(cairo_dir)/../zlib/zdll.lib' instead of just 'zdll.lib'. Also, do similarly for the headers. --- build/Makefile.win32.common | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common index 2fa3255c8..c1f0cb847 100644 --- a/build/Makefile.win32.common +++ b/build/Makefile.win32.common @@ -27,17 +27,19 @@ PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -CAIRO_LIBS += libpng.lib +LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/ +CAIRO_LIBS += $(top_builddir)/../libpng/libpng.lib endif ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) else -CAIRO_LIBS += zdll.lib +ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ +CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib endif DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT) DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE DEFAULT_CFLAGS += -I. -I$(top_srcdir) -DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) +DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)