Re: [PATCH] modify win32 makefile to make paths to pixman, libpng and zlib configurable by commandline

Bryce Harrington <[email protected]> Thu, 11 Sep 2014 13:01:12 -0700
Newsgroups	gmane.comp.lib.cairo
Message-ID	<[email protected]>
On Fri, Sep 05, 2014 at 05:08:55PM +0200, David Weiß wrote:
> 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!

Reviewed-by: Bryce Harrington <[email protected]>

Merged, thanks.

Bryce
 
> --
> 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
> 

> [0;0mFrom ed88a05138fe3a34e033db68b0a31e56b8f88f5e Mon Sep 17 00:00:00 2001[0;0m
> [0;0mFrom: =?UTF-8?q?David=20Wei=C3=9F?= <[email protected]>[0;0m
> [0;0mDate: Fri, 5 Sep 2014 17:03:26 +0200[0;0m
> [0;0mSubject: [PATCH] made paths to pixman, libpng and zlib configurable by[0;0m
> [0;0m commandline for win32 builds[0;0m
> [0;0m[0;0m
> [0;32m---[0;0m
> [0;0m build/Makefile.win32.common | 23 +++++++++++++++++------[0;0m
> [0;0m 1 file changed, 17 insertions(+), 6 deletions(-)[0;0m
> [0;0m[0;0m
> [0;34mdiff --git a/build/Makefile.win32.common b/build/Makefile.win32.common[0;0m
> [0;0mindex 01a38cd..7d7e973 100644[0;0m
> [0;32m--- a/build/Makefile.win32.common[0;0m
> [1;32m+++ b/build/Makefile.win32.common[0;0m
> [1;34m@@ -23,18 +23,29 @@ CFG_CFLAGS := -MD -O2[0;0m
> [0;0m CFG_LDFLAGS :=[0;0m
> [0;0m endif[0;0m
> [0;0m [0;0m
> [0;32m-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman[0;0m
> [0;32m-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib[0;0m
> [1;32m+ifeq ($(PIXMAN_PATH),)[0;0m
> [1;32m+PIXMAN_PATH := $(top_builddir)/../pixman[0;0m
> [1;32m+endif[0;0m
> [1;32m+PIXMAN_CFLAGS := -I$(PIXMAN_PATH)/pixman/[0;0m
> [1;32m+PIXMAN_LIBS := $(PIXMAN_PATH)/pixman/$(CFG)/pixman-1.lib[0;0m
> [0;0m [0;0m
> [0;0m CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib[0;0m
> [1;32m+[0;0m
> [0;0m ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)[0;0m
> [0;32m-LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/[0;0m
> [0;32m-CAIRO_LIBS +=  $(top_builddir)/../libpng/libpng.lib[0;0m
> [1;32m+ifeq ($(LIBPNG_PATH),)[0;0m
> [1;32m+LIBPNG_PATH := $(top_builddir)/../libpng[0;0m
> [1;32m+endif[0;0m
> [1;32m+LIBPNG_CFLAGS += -I$(LIBPNG_PATH)/[0;0m
> [1;32m+CAIRO_LIBS +=  $(LIBPNG_PATH)/libpng.lib[0;0m
> [0;0m endif[0;0m
> [1;32m+[0;0m
> [0;0m ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)[0;0m
> [0;0m else[0;0m
> [0;32m-ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/[0;0m
> [0;32m-CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib[0;0m
> [1;32m+ifeq ($(ZLIB_PATH),)[0;0m
> [1;32m+ZLIB_PATH := $(top_builddir)/../zlib[0;0m
> [1;32m+endif[0;0m
> [1;32m+ZLIB_CFLAGS += -I$(ZLIB_PATH)/[0;0m
> [1;32m+CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib[0;0m
> [0;0m endif[0;0m
> [0;0m [0;0m
> [0;0m DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS)[0;0m
> [0;32m-- [0;0m
> [0;0m1.9.4.msysgit.0[0;0m
> [0;0m[0;0m

> -- 
> cairo mailing list
> [email protected]
> http://lists.cairographics.org/mailman/listinfo/cairo

-- 
cairo mailing list
[email protected]
http://lists.cairographics.org/mailman/listinfo/cairo