Commit 96dc4492 authored by Pekka Paalanen's avatar Pekka Paalanen

Rename matrix.h to libweston/matrix.h

matrix.h is a public installed header and even used by libweston.h.

See "Rename compositor.h to libweston/libweston.h" for rationale.
Signed-off-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.com>
parent 9eda0ea8
......@@ -38,7 +38,7 @@
#include "window.h"
#include "shared/helpers.h"
#include "shared/matrix.h"
#include <libweston/matrix.h>
/* Our points for the calibration must be not be on a line */
static const struct {
......@@ -286,7 +286,7 @@ main(int argc, char *argv[])
break;
}
}
display = display_create(&argc, argv);
if (display == NULL) {
......
......@@ -40,7 +40,7 @@
#include "clients/window.h"
#include "shared/helpers.h"
#include "shared/matrix.h"
#include <libweston/matrix.h>
#include "weston-touch-calibration-client-protocol.h"
......
......@@ -41,7 +41,7 @@ extern "C" {
#define WL_HIDE_DEPRECATED
#include <wayland-server.h>
#include "matrix.h"
#include <libweston/matrix.h>
#include "config-parser.h"
#include "zalloc.h"
#include <libweston/timeline-object.h>
......
install_headers(
'libweston.h',
'matrix.h',
'plugin-registry.h',
'timeline-object.h',
'windowed-output-api.h',
......
......@@ -58,7 +58,6 @@ srcs_libweston = [
install_headers(
'../shared/config-parser.h',
'../shared/matrix.h',
'../shared/zalloc.h',
subdir: dir_include_libweston
)
......
......@@ -37,7 +37,7 @@
#include <wayland-server.h>
#endif
#include "matrix.h"
#include <libweston/matrix.h>
/*
......
......@@ -17,6 +17,7 @@ lib_libshared = static_library(
)
dep_libshared = declare_dependency(
link_with: lib_libshared,
include_directories: public_inc,
dependencies: deps_libshared
)
......
......@@ -32,7 +32,7 @@
#include <signal.h>
#include <time.h>
#include "shared/matrix.h"
#include <libweston/matrix.h>
struct inverse_matrix {
double LU[16]; /* column-major */
......
......@@ -97,7 +97,7 @@ dep_zucmain = declare_dependency(
tests_standalone = [
['config-parser', [], [ dep_zucmain ]],
['matrix', [ '../shared/matrix.c' ], [ dep_libm ]],
['matrix', [ '../shared/matrix.c' ], [ dep_libm, dep_libshared.partial_dependency(includes: true) ]],
['string'],
[
'vertex-clip',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment