Commit e77d0a5611fedce2bfa0940ff62f003c1f9cfa08 - cairo

made paths to pixman, libpng and zlib configurable by commandline for win32 builds Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> David Weiß authored 9 years ago Bryce Harrington committed 9 years ago

1 changed file(s) with 17 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all

+17

-6

build/Makefile.win32.common less more

22	22	CFG_LDFLAGS :=
23	23	endif
24	24
25		PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
26		PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
	25	ifeq ($(PIXMAN_PATH),)
	26	PIXMAN_PATH := $(top_builddir)/../pixman
	27	endif
	28	PIXMAN_CFLAGS := -I$(PIXMAN_PATH)/pixman/
	29	PIXMAN_LIBS := $(PIXMAN_PATH)/pixman/$(CFG)/pixman-1.lib
27	30
28	31	CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib
	32
29	33	ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
30		LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/
31		CAIRO_LIBS += $(top_builddir)/../libpng/libpng.lib
	34	ifeq ($(LIBPNG_PATH),)
	35	LIBPNG_PATH := $(top_builddir)/../libpng
32	36	endif
	37	LIBPNG_CFLAGS += -I$(LIBPNG_PATH)/
	38	CAIRO_LIBS += $(LIBPNG_PATH)/libpng.lib
	39	endif
	40
33	41	ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
34	42	else
35		ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/
36		CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib
	43	ifeq ($(ZLIB_PATH),)
	44	ZLIB_PATH := $(top_builddir)/../zlib
	45	endif
	46	ZLIB_CFLAGS += -I$(ZLIB_PATH)/
	47	CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib
37	48	endif
38	49
39	50	DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS)