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 <pekka.paalanen@collabora.com>
dev
Pekka Paalanen 6 years ago
parent 9eda0ea825
commit 96dc449259
  1. 4
      clients/calibrator.c
  2. 2
      clients/touch-calibrator.c
  3. 2
      include/libweston/libweston.h
  4. 0
      include/libweston/matrix.h
  5. 1
      include/libweston/meson.build
  6. 1
      libweston/meson.build
  7. 2
      shared/matrix.c
  8. 1
      shared/meson.build
  9. 2
      tests/matrix-test.c
  10. 2
      tests/meson.build

@ -38,7 +38,7 @@
#include "window.h" #include "window.h"
#include "shared/helpers.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 */ /* Our points for the calibration must be not be on a line */
static const struct { static const struct {
@ -286,7 +286,7 @@ main(int argc, char *argv[])
break; break;
} }
} }
display = display_create(&argc, argv); display = display_create(&argc, argv);
if (display == NULL) { if (display == NULL) {

@ -40,7 +40,7 @@
#include "clients/window.h" #include "clients/window.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/matrix.h" #include <libweston/matrix.h>
#include "weston-touch-calibration-client-protocol.h" #include "weston-touch-calibration-client-protocol.h"

@ -41,7 +41,7 @@ extern "C" {
#define WL_HIDE_DEPRECATED #define WL_HIDE_DEPRECATED
#include <wayland-server.h> #include <wayland-server.h>
#include "matrix.h" #include <libweston/matrix.h>
#include "config-parser.h" #include "config-parser.h"
#include "zalloc.h" #include "zalloc.h"
#include <libweston/timeline-object.h> #include <libweston/timeline-object.h>

@ -1,5 +1,6 @@
install_headers( install_headers(
'libweston.h', 'libweston.h',
'matrix.h',
'plugin-registry.h', 'plugin-registry.h',
'timeline-object.h', 'timeline-object.h',
'windowed-output-api.h', 'windowed-output-api.h',

@ -58,7 +58,6 @@ srcs_libweston = [
install_headers( install_headers(
'../shared/config-parser.h', '../shared/config-parser.h',
'../shared/matrix.h',
'../shared/zalloc.h', '../shared/zalloc.h',
subdir: dir_include_libweston subdir: dir_include_libweston
) )

@ -37,7 +37,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#endif #endif
#include "matrix.h" #include <libweston/matrix.h>
/* /*

@ -17,6 +17,7 @@ lib_libshared = static_library(
) )
dep_libshared = declare_dependency( dep_libshared = declare_dependency(
link_with: lib_libshared, link_with: lib_libshared,
include_directories: public_inc,
dependencies: deps_libshared dependencies: deps_libshared
) )

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

@ -97,7 +97,7 @@ dep_zucmain = declare_dependency(
tests_standalone = [ tests_standalone = [
['config-parser', [], [ dep_zucmain ]], ['config-parser', [], [ dep_zucmain ]],
['matrix', [ '../shared/matrix.c' ], [ dep_libm ]], ['matrix', [ '../shared/matrix.c' ], [ dep_libm, dep_libshared.partial_dependency(includes: true) ]],
['string'], ['string'],
[ [
'vertex-clip', 'vertex-clip',

Loading…
Cancel
Save