[cairo] Win32 makefiles patch

Daniel Amelang daniel.amelang at gmail.com
Sun Feb 11 03:41:43 PST 2007


The Makefile.win32 makefiles are out-of-date. This patch makes cairo
compilable with then again. I also did some very minor work on the
"clean" rules.

Good enough to push?

Dan

>From 8bc9688d4a584816cfafa36f87fd7c8ff0c025d2 Mon Sep 17 00:00:00 2001
From: Dan Amelang <dan at amelang.net>
Date: Sun, 11 Feb 2007 00:16:52 -0800
Subject: [PATCH] Update Win32 makefiles

Since the last time these makefiles were last updated some new source
files have been added and one renamed. In addition, a "clean" rule
needed to be added to the pixman makefile. And the "clean" rule in the
main cairo makefile wasn't working properly for me.
---
 pixman/src/Makefile.win32 |    2 ++
 src/Makefile.win32        |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pixman/src/Makefile.win32 b/pixman/src/Makefile.win32
old mode 100644
new mode 100755
index 7fda0bb..fcbe53b
--- a/pixman/src/Makefile.win32
+++ b/pixman/src/Makefile.win32
@@ -33,3 +33,5 @@ all: pixman.lib
 pixman.lib: $(OBJECTS)
 	lib /NOLOGO /OUT:$@ $(OBJECTS)

+clean:
+	@rm -f *.obj *.lib *.pdb || exit 0
diff --git a/src/Makefile.win32 b/src/Makefile.win32
old mode 100644
new mode 100755
index 27d17d0..6499c6e
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -9,13 +9,16 @@ srcdir = `pwd`
 SOURCES = \
 	cairo-arc.c \
 	cairo-array.c \
+	cairo-bentley-ottmann.c \
 	cairo-cache.c \
 	cairo-clip.c \
 	cairo-color.c \
 	cairo-debug.c \
+	cairo-deflate-stream.c \
 	cairo-fixed.c \
 	cairo-font-options.c \
 	cairo-font.c \
+	cairo-freelist.c \
 	cairo-gstate.c \
 	cairo-hash.c \
 	cairo-hull.c \
@@ -26,7 +29,7 @@ SOURCES = \
 	cairo-output-stream.c \
 	cairo-operator.c \
 	cairo-path-bounds.c \
-	cairo-path-data.c \
+	cairo-path-fixed.c \
 	cairo-path-fill.c \
 	cairo-path-stroke.c \
 	cairo-path.c \
@@ -37,6 +40,7 @@ SOURCES = \
 	cairo-rectangle.c \
 	cairo-region.c \
 	cairo-scaled-font.c \
+	cairo-skiplist.c \
 	cairo-slope.c \
 	cairo-spline.c \
 	cairo-stroke-style.c \
@@ -105,4 +109,4 @@ cairo-static.lib: $(OBJECTS) $(STATIC_OBJECTS)


 clean:
-	@rm -f *.obj || rm -f *.dll || rm -f *.lib || rm -f *.exe || rm -f
*.exe.manifest || rm -f *.pdb || rm -f *.ilk || exit 0
+	@rm -f *.obj *.dll *.lib *.pdb *.ilk || exit 0
-- 
1.4.4.4


More information about the cairo mailing list