[PATCH] modify win32 makefile to make paths to pixman, libpng and zlib configurable by commandline
David Weiß <[email protected]>
| Newsgroups | gmane.comp.lib.cairo |
|---|---|
| Message-ID | <E8D289FB71C3004B832D1702922D3A200313C1D71D@SKA-WN-E25CEX.ptvag.ptv.de> |
Hey, in an effort to make the cairo repository more build-friendly in custom environments, I added a few options to the win32 makefile. Attached is a patchfile, which enables setting the library paths to pixman, libpng and zlib using the three options PIXMAN_PATH, LIBPNG_PATH and ZLIB_PATH respectively. Thank you for your feedback! -- David Weiß PTV GROUP Logistics Software Development Haid-und-Neu-Str. 15, 76131 Karlsruhe, Germany [email protected]<mailto:[email protected]> www.ptvgroup.com<http://www.ptvgroup.com/> http://ptv.to/facebook PTV Planung Transport Verkehr AG Headquarters: Karlsruhe Executive Board: Vincent Kobesen (CEO) Chairman of the Supervisory Board: Dr. h.c. Frank-Jürgen Weise Commercial Register (HRB-Nr): 109262 Local Court: Mannheim -- cairo mailing list [email protected] http://lists.cairographics.org/mailman/listinfo/cairo
0001-made-paths-to-pixman-libpng-and-zlib-configurable-by.patch
(application/octet-stream, 1.6 KB)
From ed88a05138fe3a34e033db68b0a31e56b8f88f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Wei=C3=9F?= <[email protected]> Date: Fri, 5 Sep 2014 17:03:26 +0200 Subject: [PATCH] made paths to pixman, libpng and zlib configurable by commandline for win32 builds --- build/Makefile.win32.common | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common index 01a38cd..7d7e973 100644 --- a/build/Makefile.win32.common +++ b/build/Makefile.win32.common @@ -23,18 +23,29 @@ CFG_CFLAGS := -MD -O2 CFG_LDFLAGS := endif -PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman -PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib +ifeq ($(PIXMAN_PATH),) +PIXMAN_PATH := $(top_builddir)/../pixman +endif +PIXMAN_CFLAGS := -I$(PIXMAN_PATH)/pixman/ +PIXMAN_LIBS := $(PIXMAN_PATH)/pixman/$(CFG)/pixman-1.lib CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib + ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/ -CAIRO_LIBS += $(top_builddir)/../libpng/libpng.lib +ifeq ($(LIBPNG_PATH),) +LIBPNG_PATH := $(top_builddir)/../libpng +endif +LIBPNG_CFLAGS += -I$(LIBPNG_PATH)/ +CAIRO_LIBS += $(LIBPNG_PATH)/libpng.lib endif + ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) else -ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ -CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib +ifeq ($(ZLIB_PATH),) +ZLIB_PATH := $(top_builddir)/../zlib +endif +ZLIB_CFLAGS += -I$(ZLIB_PATH)/ +CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib endif DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS) -- 1.9.4.msysgit.0