Move matrix.[ch] to shared

This means it can be used for the calibration tool.
dev
Rob Bradford 12 years ago committed by Kristian Høgsberg
parent 80137f3afe
commit 4a822495fa
  1. 4
      shared/Makefile.am
  2. 0
      shared/matrix.c
  3. 0
      shared/matrix.h
  4. 2
      src/Makefile.am
  5. 2
      src/compositor.h
  6. 4
      tests/Makefile.am
  7. 2
      tests/matrix-test.c

@ -7,7 +7,9 @@ libshared_la_SOURCES = \
option-parser.c \ option-parser.c \
config-parser.h \ config-parser.h \
os-compatibility.c \ os-compatibility.c \
os-compatibility.h os-compatibility.h \
matrix.c \
matrix.h
libshared_cairo_la_CFLAGS = \ libshared_cairo_la_CFLAGS = \
$(GCC_CFLAGS) \ $(GCC_CFLAGS) \

@ -32,8 +32,6 @@ weston_SOURCES = \
workspaces-protocol.c \ workspaces-protocol.c \
workspaces-server-protocol.h \ workspaces-server-protocol.h \
util.c \ util.c \
matrix.c \
matrix.h \
gl-renderer.h \ gl-renderer.h \
gl-renderer.c \ gl-renderer.c \
noop-renderer.c \ noop-renderer.c \

@ -28,7 +28,7 @@
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <wayland-server.h> #include <wayland-server.h>
#include "matrix.h" #include "../shared/matrix.h"
#include "../shared/config-parser.h" #include "../shared/config-parser.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])

@ -36,8 +36,8 @@ noinst_PROGRAMS = $(setbacklight) matrix-test
matrix_test_SOURCES = \ matrix_test_SOURCES = \
matrix-test.c \ matrix-test.c \
$(top_srcdir)/src/matrix.c \ $(top_srcdir)/shared/matrix.c \
$(top_srcdir)/src/matrix.h $(top_srcdir)/shared/matrix.h
matrix_test_LDADD = -lm -lrt matrix_test_LDADD = -lm -lrt
setbacklight_SOURCES = \ setbacklight_SOURCES = \

@ -27,7 +27,7 @@
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#include "matrix.h" #include "../shared/matrix.h"
struct inverse_matrix { struct inverse_matrix {
double LU[16]; /* column-major */ double LU[16]; /* column-major */

Loading…
Cancel
Save