fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-09 02:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[win32] Fix building with libpng and zlib

Browse source 
Include zlib and libpng dependencies using something like '$(cairo_dir)/../zlib/zdll.lib'
instead of just 'zdll.lib'. Also, do similarly for the headers.
This commit is contained in:
Jeff Muizelaar 2009-04-07 14:50:25 -04:00
parent 1798fc6607
commit f853972636
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/Makefile.win32.common
View file

@ -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)