Mercurial > mxe-octave
annotate src/msvc-cairo-1.patch @ 3929:6cb1bf4d1ab4
osmesa: update path to package
* src/osmesa.mk: update package urk
author | John Donoghue |
---|---|
date | Tue, 05 May 2015 15:08:30 -0400 |
parents | 6aaa1723e277 |
children |
rev | line source |
---|---|
3167
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur cairo-1.12.14-orig/perf/cairo-analyse-trace.c cairo-1.12.14/perf/cairo-analyse-trace.c |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- cairo-1.12.14-orig/perf/cairo-analyse-trace.c 2012-02-01 19:48:14 -0500 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ cairo-1.12.14/perf/cairo-analyse-trace.c 2013-07-22 13:51:18 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -53,7 +53,19 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 #include <sys/stat.h> |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 #ifdef _MSC_VER |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 +#ifdef __CLGCC__ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 +#include <dirent.h> |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 +#else |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 #include "dirent-win32.h" |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 + |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 +#ifndef R_OK |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 +#define R_OK 4 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 + |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 +#ifndef S_ISDIR |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 +#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 static char * |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 basename_no_ext (char *path) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 @@ -212,8 +224,8 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 { |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 char *trace_cpy, *name; |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 const cairo_script_interpreter_hooks_t hooks = { |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 - .closure = args, |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 - .surface_create = surface_create, |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 + /*.closure =*/ args, |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 + /*.surface_create =*/ surface_create, |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 }; |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 trace_cpy = xstrdup (trace); |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 diff -ur cairo-1.12.14-orig/perf/cairo-perf-trace.c cairo-1.12.14/perf/cairo-perf-trace.c |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 --- cairo-1.12.14-orig/perf/cairo-perf-trace.c 2013-01-29 08:54:51 -0500 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 +++ cairo-1.12.14/perf/cairo-perf-trace.c 2013-07-22 13:51:41 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 @@ -54,7 +54,19 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 #include <sys/stat.h> |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 #ifdef _MSC_VER |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 +#ifdef __CLGCC__ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 +#include <dirent.h> |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 +#else |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 #include "dirent-win32.h" |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 + |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 +#ifndef R_OK |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 +#define R_OK 4 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 + |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 +#ifndef S_ISDIR |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 +#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 static char * |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
57 basename_no_ext (char *path) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 diff -ur cairo-1.12.14-orig/src/Makefile.in cairo-1.12.14/src/Makefile.in |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 --- cairo-1.12.14-orig/src/Makefile.in 2013-02-10 08:39:15 -0500 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 +++ cairo-1.12.14/src/Makefile.in 2013-07-22 13:16:42 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
61 @@ -1639,7 +1639,7 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 #MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
63 AM_CPPFLAGS = -I$(srcdir) $(CAIRO_CFLAGS) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
64 AM_LDFLAGS = $(CAIRO_LDFLAGS) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
65 -@OS_WIN32_TRUE@export_symbols = -export-symbols cairo.def |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
66 +@OS_WIN32_TRUE@export_symbols = -export-symbols-regex "xXx" -Wl,cairo.def |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
67 @OS_WIN32_TRUE@cairo_def_dependency = cairo.def |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 cairoincludedir = $(includedir)/cairo |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
69 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 @@ -2720,7 +2720,6 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
71 $(EGREP) '^cairo_.* \(' | \ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 sed -e 's/[ ].*//' | \ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
73 sort; \ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
74 - echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
75 ) >$@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
76 @ ! grep -q cairo_ERROR $@ || ($(RM) $@; false) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
77 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
78 diff -ur cairo-1.12.14-orig/src/cairo-ft-font.c cairo-1.12.14/src/cairo-ft-font.c |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
79 --- cairo-1.12.14-orig/src/cairo-ft-font.c 2013-01-03 15:06:16 -0500 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
80 +++ cairo-1.12.14/src/cairo-ft-font.c 2013-07-22 13:13:21 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
81 @@ -66,6 +66,9 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
82 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
83 #if HAVE_UNISTD_H |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
84 #include <unistd.h> |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
85 +#if defined (_MSC_VER) && ! defined (R_OK) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
86 +#define R_OK 4 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
87 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
88 #else |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
89 #define access(p, m) 0 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
90 #endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
91 diff -ur cairo-1.12.14-orig/test/bitmap-font.c cairo-1.12.14/test/bitmap-font.c |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
92 --- cairo-1.12.14-orig/test/bitmap-font.c 2010-06-13 15:58:21 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
93 +++ cairo-1.12.14/test/bitmap-font.c 2013-07-22 13:39:06 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
94 @@ -36,6 +36,10 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
95 #define FONT "6x13.pcf" |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
96 #define TEXT_SIZE 13 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
97 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
98 +#if defined (_MSC_VER) && ! defined (S_ISREG) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
99 +# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
100 +#endif |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
101 + |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
102 static cairo_bool_t |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
103 font_extents_equal (const cairo_font_extents_t *A, |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
104 const cairo_font_extents_t *B) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
105 diff -ur cairo-1.12.14-orig/test/ft-show-glyphs-table.c cairo-1.12.14/test/ft-show-glyphs-table.c |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
106 --- cairo-1.12.14-orig/test/ft-show-glyphs-table.c 2010-06-13 15:58:21 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
107 +++ cairo-1.12.14/test/ft-show-glyphs-table.c 2013-07-22 13:36:00 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
108 @@ -88,7 +88,9 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
109 { |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
110 charcode = FT_Get_First_Char(face, &idx); |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
111 while (idx && (i < NUM_GLYPHS)) { |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
112 - glyphs[i] = (cairo_glyph_t) {idx, PAD + GRID_SIZE * (i/GRID_ROWS), PAD + TEXT_SIZE + GRID_SIZE * (i%GRID_ROWS)}; |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
113 + glyphs[i].index = idx; |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
114 + glyphs[i].x = PAD + GRID_SIZE * (i/GRID_ROWS); |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
115 + glyphs[i].y = PAD + TEXT_SIZE + GRID_SIZE * (i%GRID_ROWS); |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
116 i++; |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
117 charcode = FT_Get_Next_Char(face, charcode, &idx); |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
118 } |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
119 diff -ur cairo-1.12.14-orig/util/cairo-gobject/Makefile.in cairo-1.12.14/util/cairo-gobject/Makefile.in |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
120 --- cairo-1.12.14-orig/util/cairo-gobject/Makefile.in 2013-02-10 08:39:17 -0500 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
121 +++ cairo-1.12.14/util/cairo-gobject/Makefile.in 2013-07-22 13:28:22 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
122 @@ -388,7 +388,7 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
123 $(NULL) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
124 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
125 libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
126 -libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
127 +libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex "^cairo_gobject_.*" |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
128 libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
129 all: all-am |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
130 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
131 diff -ur cairo-1.12.14-orig/util/cairo-script/Makefile.in cairo-1.12.14/util/cairo-script/Makefile.in |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
132 --- cairo-1.12.14-orig/util/cairo-script/Makefile.in 2013-02-10 08:39:17 -0500 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
133 +++ cairo-1.12.14/util/cairo-script/Makefile.in 2013-07-22 13:28:01 -0400 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
134 @@ -480,7 +480,7 @@ |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
135 $(NULL) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
136 |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
137 libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
138 -libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
139 +libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -export-symbols-regex "^cairo_script_.*" |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
140 libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
141 csi_replay_SOURCES = csi-replay.c |
6aaa1723e277
[MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
142 csi_replay_CFLAGS = $(CAIRO_CFLAGS) |