[cairo] [PATCH 1/3] Windows: Use DOS path separators in Makefile

Simon Richter Simon.Richter at hogyros.de
Fri Dec 20 12:39:14 UTC 2019


---
 build/Makefile.win32.common | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common
index 7d7e9735f..093b0223a 100644
--- a/build/Makefile.win32.common
+++ b/build/Makefile.win32.common
@@ -24,32 +24,32 @@ CFG_LDFLAGS :=
 endif
 
 ifeq ($(PIXMAN_PATH),)
-PIXMAN_PATH := $(top_builddir)/../pixman
+PIXMAN_PATH := $(top_builddir)\..\pixman
 endif
-PIXMAN_CFLAGS := -I$(PIXMAN_PATH)/pixman/
-PIXMAN_LIBS := $(PIXMAN_PATH)/pixman/$(CFG)/pixman-1.lib
+PIXMAN_CFLAGS := -I"$(PIXMAN_PATH)\pixman"
+PIXMAN_LIBS := $(PIXMAN_PATH)\pixman\pixman-1.lib
 
 CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
 
 ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
 ifeq ($(LIBPNG_PATH),)
-LIBPNG_PATH := $(top_builddir)/../libpng
+LIBPNG_PATH := $(top_builddir)\..\libpng
 endif
-LIBPNG_CFLAGS += -I$(LIBPNG_PATH)/
-CAIRO_LIBS +=  $(LIBPNG_PATH)/libpng.lib
+LIBPNG_CFLAGS += -I"$(LIBPNG_PATH)"
+CAIRO_LIBS +=  $(LIBPNG_PATH)\libpng.lib
 endif
 
 ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
 else
 ifeq ($(ZLIB_PATH),)
-ZLIB_PATH := $(top_builddir)/../zlib
+ZLIB_PATH := $(top_builddir)\..\zlib
 endif
-ZLIB_CFLAGS += -I$(ZLIB_PATH)/
-CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib
+ZLIB_CFLAGS += -I"$(ZLIB_PATH)"
+CAIRO_LIBS += $(ZLIB_PATH)\zdll.lib
 endif
 
 DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS)
-DEFAULT_CFLAGS += -I. -I$(top_srcdir) -I$(top_srcdir)/src
+DEFAULT_CFLAGS += -I. -I$(top_srcdir) -I$(top_srcdir)\src
 DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
 
 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
-- 
2.20.1



More information about the cairo mailing list