Attachment 42063 Details for Bug 33136 – Patch to allow clean building under Windows.

[patch] Patch to allow clean building under Windows.

cairo_win32.diff (text/plain), 8.54 KB, created by Brent Fulgham on 2011-01-14 14:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2011-01-14 14:10:04 UTC

Size: 8.54 KB

patch

obsolete

>diff -rwu3N cairo-1.10.2/boilerplate/Makefile.win32 cairo-1.10.2.new/boilerplate/Makefile.win32
>--- cairo-1.10.2/boilerplate/Makefile.win32	2009-06-14 14:53:24.000000000 -0700
>+++ cairo-1.10.2.new/boilerplate/Makefile.win32	2011-01-14 13:32:57.895545500 -0800
>@@ -11,10 +11,13 @@
> 
> SOURCES = \
> 	$(enabled_cairo_boilerplate_sources) \
>+   cairo-boilerplate-constructors.c \
> 	$(NULL)
> 
> OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES))
> 
>+cairo-boilerplate-constructors.c: Makefile.win32 $(enabled_cairo_boilerplate_sources) $(enabled_cairo_boilerplate_cxx_sources) make-cairo-boilerplate-constructors.sh
>+	sh ./make-cairo-boilerplate-constructors.sh $(enabled_cairo_boilerplate_sources) $(enabled_cairo_boilerplate_cxx_sources) > $@
> 
> all: $(CFG)/boiler.lib
> 
>diff -rwu3N cairo-1.10.2/boilerplate/cairo-boilerplate-pdf.c cairo-1.10.2.new/boilerplate/cairo-boilerplate-pdf.c
>--- cairo-1.10.2/boilerplate/cairo-boilerplate-pdf.c	2010-12-25 06:21:33.000000000 -0800
>+++ cairo-1.10.2.new/boilerplate/cairo-boilerplate-pdf.c	2011-01-14 11:21:51.350969700 -0800
>@@ -263,6 +263,8 @@
> 	_cairo_boilerplate_pdf_cleanup,
> 	NULL, NULL, FALSE, TRUE, TRUE
>     },
>+#else
>+   0
> #endif
> };
> CAIRO_BOILERPLATE (pdf, targets)
>diff -rwu3N cairo-1.10.2/boilerplate/cairo-boilerplate-ps.c cairo-1.10.2.new/boilerplate/cairo-boilerplate-ps.c
>--- cairo-1.10.2/boilerplate/cairo-boilerplate-ps.c	2010-12-25 06:21:33.000000000 -0800
>+++ cairo-1.10.2.new/boilerplate/cairo-boilerplate-ps.c	2011-01-14 11:21:14.469281900 -0800
>@@ -349,6 +349,8 @@
> 	_cairo_boilerplate_ps_cleanup,
> 	NULL, NULL, FALSE, TRUE, TRUE
>     },
>+#else
>+   0
> #endif
> };
> CAIRO_BOILERPLATE (ps, targets)
>diff -rwu3N cairo-1.10.2/boilerplate/cairo-boilerplate-svg.c cairo-1.10.2.new/boilerplate/cairo-boilerplate-svg.c
>--- cairo-1.10.2/boilerplate/cairo-boilerplate-svg.c	2010-12-25 06:21:33.000000000 -0800
>+++ cairo-1.10.2.new/boilerplate/cairo-boilerplate-svg.c	2011-01-14 11:22:12.951129500 -0800
>@@ -324,6 +324,8 @@
> 	_cairo_boilerplate_svg_cleanup,
> 	NULL, NULL, FALSE, TRUE, TRUE
>     },
>+#else
>+   0
> #endif
> };
> CAIRO_BOILERPLATE (svg, targets)
>diff -rwu3N cairo-1.10.2/boilerplate/cairo-boilerplate-win32-printing.c cairo-1.10.2.new/boilerplate/cairo-boilerplate-win32-printing.c
>--- cairo-1.10.2/boilerplate/cairo-boilerplate-win32-printing.c	2010-07-12 01:57:03.000000000 -0700
>+++ cairo-1.10.2.new/boilerplate/cairo-boilerplate-win32-printing.c	2011-01-14 11:21:17.157550700 -0800
>@@ -367,6 +367,8 @@
> 	_cairo_boilerplate_win32_printing_cleanup,
> 	NULL, NULL, FALSE, TRUE, TRUE
>     },
>+#else
>+   0
> #endif
> };
> CAIRO_BOILERPLATE (win32_printing, targets)
>diff -rwu3N cairo-1.10.2/build/Makefile.win32.common cairo-1.10.2.new/build/Makefile.win32.common
>--- cairo-1.10.2/build/Makefile.win32.common	2011-01-14 10:31:07.841649200 -0800
>+++ cairo-1.10.2.new/build/Makefile.win32.common	2011-01-14 12:53:11.876967500 -0800
>@@ -37,7 +37,7 @@
> endif
> 
> DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT)
>-DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
>+DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDISABLE_SOME_FLOATING_POINT -D_BIND_TO_CURRENT_VCLIBS_VERSION -D_MT
> DEFAULT_CFLAGS += -I. -I$(top_srcdir)
> DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
> 
>diff -rwu3N cairo-1.10.2/src/Makefile.sources cairo-1.10.2.new/src/Makefile.sources
>--- cairo-1.10.2/src/Makefile.sources	2010-12-25 06:21:34.000000000 -0800
>+++ cairo-1.10.2.new/src/Makefile.sources	2011-01-14 10:17:22.235096800 -0800
>@@ -214,7 +214,7 @@
> cairo_pdf_headers = cairo-pdf.h
> cairo_pdf_private = cairo-pdf-surface-private.h
> cairo_pdf_sources = cairo-pdf-surface.c
>-if CAIRO_HAS_PDF_SURFACE
>+ifeq ($(CAIRO_HAS_PDF_SURFACE), 1)
> req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
> endif
> 
>@@ -248,7 +248,7 @@
> 	cairo-xlib-surface-private.h \
> 	cairo-xlib-xrender-private.h \
> 	$(NULL)
>-if BUILD_XLIB_XCB
>+ifeq ($(BUILD_XLIB_XCB),1)
> cairo_xlib_sources = cairo-xlib-xcb-surface.c
> else
> cairo_xlib_sources = \
>@@ -273,7 +273,7 @@
> 		    cairo-xcb-surface-core.c \
> 		    cairo-xcb-surface-render.c \
> 		    $(NULL)
>-if BUILD_XCB_SHM
>+ifeq ($(BUILD_XCB_SHM), 1)
> cairo_xcb_sources += \
> 		    cairo-xcb-shm.c \
> 		    cairo-xcb-connection-shm.c \
>@@ -322,7 +322,7 @@
> 		   cairo-gl-gradient.c \
> 		   cairo-gl-shaders.c \
> 		   cairo-gl-surface.c
>-if BUILD_PRIVATE_GLEW
>+ifeq ($(BUILD_PRIVATE_GLEW), 1)
> cairo_gl_sources += glew/glew.c
> endif
> 
>@@ -373,7 +373,7 @@
> 
> cairo_script_headers = cairo-script.h
> cairo_script_sources = cairo-script-surface.c
>-if CAIRO_HAS_SCRIPT_SURFACE
>+ifeq ($(CAIRO_HAS_SCRIPT_SURFACE), 1)
> req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
> endif
> 
>@@ -383,7 +383,7 @@
> 
> cairo_xml_headers = cairo-xml.h
> cairo_xml_sources = cairo-xml-surface.c
>-if CAIRO_HAS_XML_SURFACE
>+ifeq ($(CAIRO_HAS_XML_SURFACE), 1)
> req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
> endif
> 
>diff -rwu3N cairo-1.10.2/test/Makefile.win32 cairo-1.10.2.new/test/Makefile.win32
>--- cairo-1.10.2/test/Makefile.win32	2010-12-25 06:21:34.000000000 -0800
>+++ cairo-1.10.2.new/test/Makefile.win32	2011-01-14 12:09:45.292335100 -0800
>@@ -14,11 +14,14 @@
> 
> all: cairo-test-suite.exe
> 
>-make-cairo-test-constructors.exe: $(CFG)/make-cairo-test-constructors.obj
>-	$(CC) $(OPT) $(MS_MDFLAGS) $(CFG)/make-cairo-test-constructors.obj -Fe"$@" -link $(LDFLAGS) user32.lib /NODEFAULTLIB:library
>+cairo-test-constructors.c: Makefile.win32 $(test_sources) make-cairo-test-constructors.sh
>+	sh ./make-cairo-test-constructors.sh $(test_sources) > $@
> 
>-cairo-test-constructors.c: $(test_sources) make-cairo-test-constructors.exe
>-	./make-cairo-test-constructors.exe $(test_sources) > $@
>+#make-cairo-test-constructors.exe: $(CFG)/make-cairo-test-constructors.obj
>+#	$(CC) $(OPT) $(MS_MDFLAGS) $(CFG)/make-cairo-test-constructors.obj -Fe"$@" -link $(LDFLAGS) user32.lib /NODEFAULTLIB:library
>+
>+#cairo-test-constructors.c: $(test_sources) make-cairo-test-constructors.exe
>+#	./make-cairo-test-constructors.exe $(test_sources) > $@
> 
> SOURCES = $(cairo_test_suite_sources) $(test_sources) cairo-test-constructors.c
> 
>diff -rwu3N cairo-1.10.2/test/cairo-test.h cairo-1.10.2.new/test/cairo-test.h
>--- cairo-1.10.2/test/cairo-test.h	2010-06-18 04:47:16.000000000 -0700
>+++ cairo-1.10.2.new/test/cairo-test.h	2011-01-14 11:59:37.772589200 -0800
>@@ -50,6 +50,9 @@
> # ifndef HAVE_UINT64_T
> #  define HAVE_UINT64_T 1
> # endif
>+# ifndef UINT32_MAX
>+#  define UINT32_MAX   0xFFFFFFFFUL
>+# endif
> #else
> #error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, \etc.)
> #endif
>diff -rwu3N cairo-1.10.2/test/pdiff/Makefile.win32 cairo-1.10.2.new/test/pdiff/Makefile.win32
>--- cairo-1.10.2/test/pdiff/Makefile.win32	1969-12-31 16:00:00.000000000 -0800
>+++ cairo-1.10.2.new/test/pdiff/Makefile.win32	2011-01-14 12:32:26.456437900 -0800
>@@ -0,0 +1,37 @@
>+top_srcdir = ../..
>+include $(top_srcdir)/build/Makefile.win32.common
>+
>+CFLAGS += -I../../src -I../boilerplate -I./pdiff
>+
>+LDFLAGS += ./pdiff.lib ../../src/$(CFG)/cairo.lib $(PIXMAN_LIBS) $(EXE_LDFLAGS)
>+
>+PDIFF_SOURCES = \
>+   lpyramid.c \
>+   pdiff.c \
>+   $(NULL)
>+
>+PERCEPTUALDIFF_SOURCES = \
>+   args.c \
>+   perceptualdiff.c \
>+	$(NULL)
>+
>+SOURCES = \
>+   $(PDIFF_SOURCES) \
>+	$(PERCEPTUALDIFF_SOURCES) \
>+	$(NULL)
>+
>+PDIFF_OBJECTS = $(patsubst %.c, $(CFG)/%.obj, $(PDIFF_SOURCES))
>+PERCEPTUALDIFF_OBJECTS = $(patsubst %.c, $(CFG)/%.obj, $(PERCEPTUALDIFF_SOURCES))
>+
>+OBJECTS = \
>+   $(PDIFF_OBJECTS) \
>+   $(PERCEPTUALDIFF_OBJECTS) \
>+   $(NULL)
>+   
>+perceptualdiff.exe: $(PERCEPTUALDIFF_OBJECTS) ./pdiff.lib
>+	$(CC) $(OPT) $(MS_MDFLAGS) $(PERCEPTUALDIFF_OBJECTS) -Fe"$@" -link $(LDFLAGS) $(CAIRO_LIBS) /NODEFAULTLIB:library
>+
>+pdiff.lib: $(PDIFF_OBJECTS)
>+	lib -NOLOGO -OUT:$@ $(PDIFF_OBJECTS)
>+
>+all: pdiff.lib perceptualdiff.exe
>Files cairo-1.10.2/test/pdiff/pdiff.lib and cairo-1.10.2.new/test/pdiff/pdiff.lib differ
>diff -rwu3N cairo-1.10.2/test/pdiff/perceptualdiff.c cairo-1.10.2.new/test/pdiff/perceptualdiff.c
>--- cairo-1.10.2/test/pdiff/perceptualdiff.c	2010-06-18 04:47:23.000000000 -0700
>+++ cairo-1.10.2.new/test/pdiff/perceptualdiff.c	2011-01-14 12:30:54.044197600 -0800
>@@ -17,7 +17,26 @@
> */
> 
> #include <stdio.h>
>+
>+#if defined(_MSC_VER)
>+typedef __int8 int8_t;
>+typedef unsigned __int8 uint8_t;
>+typedef __int16 int16_t;
>+typedef unsigned __int16 uint16_t;
>+typedef __int32 int32_t;
>+typedef unsigned __int32 uint32_t;
>+typedef __int64 int64_t;
>+typedef unsigned __int64 uint64_t;
>+# ifndef HAVE_UINT64_T
>+#  define HAVE_UINT64_T 1
>+# endif
>+# ifndef UINT32_MAX
>+#  define UINT32_MAX   0xFFFFFFFFUL
>+# endif
>+#else
> #include <stdint.h>
>+#endif
>+
> #include <string.h>
> #include <math.h>
> #include "lpyramid.h"

Actions: View | Splinter Review

Attachments on bug 33136: 42062 | 42063 | 43134 | 43135 | 43138

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.