diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2012-12-07 15:00:32 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-12-07 15:00:36 -0500 |
| commit | 3a8d3f2e988c023769ebbdaa78574f07fecab625 (patch) | |
| tree | 92a9dae500ae3cb92f05841039331eff258a68bb /shared | |
| parent | a2f84cc333759471f62ee34a412700f204e8747b (diff) | |
Link matrix.c into weston again
We want to make sure that the matrix symbols are exported from weston and
that modules get them from there. To do that, we pull matrix.[ch] out of
libshared and back into weston. calibrator now also links to matrix.[ch]
and we add a IN_WESTON define to enable the WL_EXPORT macro when compiled
inside weston.
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/Makefile.am | 4 | ||||
| -rw-r--r-- | shared/matrix.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/shared/Makefile.am b/shared/Makefile.am index faf073db..b38cb95d 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -7,9 +7,7 @@ libshared_la_SOURCES = \ option-parser.c \ config-parser.h \ os-compatibility.c \ - os-compatibility.h \ - matrix.c \ - matrix.h + os-compatibility.h libshared_cairo_la_CFLAGS = \ $(GCC_CFLAGS) \ diff --git a/shared/matrix.c b/shared/matrix.c index 91acdd3d..11b5b959 100644 --- a/shared/matrix.c +++ b/shared/matrix.c @@ -24,7 +24,12 @@ #include <string.h> #include <stdlib.h> #include <math.h> + +#ifdef IN_WESTON #include <wayland-server.h> +#else +#define WL_EXPORT +#endif #include "matrix.h" |