diff options
| author | David Weiß <david.weiss@ptvgroup.com> | 2014-09-05 17:03:26 +0200 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2014-09-11 13:00:13 -0700 |
| commit | e77d0a5611fedce2bfa0940ff62f003c1f9cfa08 (patch) | |
| tree | b87fbe3831c17a664a017bd4b60a89a43bc712f5 /build | |
| parent | 3b9d7e583f376413df655f778a3ef04537e8a5b6 (diff) | |
made paths to pixman, libpng and zlib configurable by commandline for win32 builds
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.win32.common | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common index 01a38cd32..7d7e9735f 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) |