Commit dbadc5ce authored by Niklas Haas's avatar Niklas Haas

change all include paths to global paths

Instead of trying to include them relatively. This probably avoids
headaches down the line.
parent e2f25473
......@@ -19,7 +19,7 @@
#define LIBPLACEBO_COLORSPACE_H_
#include <stdbool.h>
#include "common.h"
#include <libplacebo/common.h>
// The underlying color representation (e.g. RGB, XYZ or YCbCr)
enum pl_color_system {
......
......@@ -18,7 +18,7 @@
#ifndef LIBPLACEBO_COMMON_H_
#define LIBPLACEBO_COMMON_H_
#include "context.h"
#include <libplacebo/context.h>
#include <stdbool.h>
// Some common utility types. These are overloaded to support 2D, 3D and
......
......@@ -18,8 +18,8 @@
#ifndef LIBPLACEBO_DISPATCH_H_
#define LIBPLACEBO_DISPATCH_H_
#include "shaders.h"
#include "ra.h"
#include <libplacebo/shaders.h>
#include <libplacebo/ra.h>
struct pl_dispatch;
......
......@@ -19,7 +19,7 @@
#define LIBPLACEBO_FILTER_KERNELS_H_
#include <stdbool.h>
#include "context.h"
#include <libplacebo/context.h>
#define PL_FILTER_MAX_PARAMS 2
......
......@@ -22,7 +22,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "common.h"
#include <libplacebo/common.h>
// This file contains the definition of an API referred to as "RA", which
// stands for Rendering Abstraction (or Rendering API) and is designed to
......
......@@ -18,7 +18,7 @@
#ifndef LIBPLACEBO_RENDERER_H_
#define LIBPLACEBO_RENDERER_H_
#include "ra.h"
#include <libplacebo/ra.h>
struct pl_renderer;
......
......@@ -24,7 +24,7 @@
// own rendering process. This API is normally not used for operation with
// libplacebo's higher-level constructs such as `pl_dispatch` or `pl_renderer`.
#include "ra.h"
#include <libplacebo/ra.h>
struct pl_shader;
......
......@@ -23,8 +23,8 @@
#include <stdint.h>
#include "../colorspace.h"
#include "../shaders.h"
#include <libplacebo/colorspace.h>
#include <libplacebo/shaders.h>
// Decode the color into normalized RGB, given a specified color_repr. This
// also takes care of additional pre- and post-conversions requires for the
......
......@@ -24,8 +24,8 @@
// is undefined behavior. They require nothing (PL_SHADER_SIG_NONE) and return
// a color (PL_SHADER_SIG_COLOR).
#include "../filters.h"
#include "../shaders.h"
#include <libplacebo/filters.h>
#include <libplacebo/shaders.h>
struct pl_deband_params {
// The number of debanding steps to perform per sample. Each step reduces a
......
......@@ -18,9 +18,9 @@
#ifndef LIBPLACEBO_SWAPCHAIN_H_
#define LIBPLACEBO_SWAPCHAIN_H_
#include "common.h"
#include "colorspace.h"
#include "ra.h"
#include <libplacebo/common.h>
#include <libplacebo/colorspace.h>
#include <libplacebo/ra.h>
// This abstraction represents a low-level interface to visible surfaces
// exposed by a graphics API (and accompanying RA instance), allowing users to
......
......@@ -17,8 +17,8 @@
#include <stdint.h>
#include "../ra.h"
#include "../renderer.h"
#include <libplacebo/ra.h>
#include <libplacebo/renderer.h>
#ifndef LIBPLACEBO_UPLOAD_H_
#define LIBPLACEBO_UPLOAD_H_
......
......@@ -19,7 +19,7 @@
#define LIBPLACEBO_VULKAN_H_
#include <vulkan/vulkan.h>
#include "ra.h"
#include <libplacebo/ra.h>
// Structure representing a VkInstance. Using this is not required.
struct pl_vk_inst {
......
......@@ -154,10 +154,12 @@ configure_file(
)
add_project_arguments(build_opts, language: 'c')
inc = include_directories('./include')
lib = library('placebo', sources,
install: true,
dependencies: build_deps,
soversion: apiver,
include_directories: inc,
)
# Install process
......@@ -177,7 +179,11 @@ tdeps = [ declare_dependency(link_with: lib) ]
if get_option('tests')
foreach t : tests
e = executable('test.' + t, 'tests/' + t, dependencies: build_deps + tdeps)
e = executable('test.' + t, 'tests/' + t,
dependencies: build_deps + tdeps,
include_directories: inc
)
test(t, e)
endforeach
endif
......@@ -187,6 +193,10 @@ if get_option('bench')
error('Compiling the benchmark suite requires vulkan support!')
endif
bench = executable('bench', 'tests/bench.c', dependencies: build_deps + tdeps)
bench = executable('bench', 'tests/bench.c',
dependencies: build_deps + tdeps,
include_directories: inc
)
test('benchmark', bench, is_parallel: false, timeout: 600)
endif
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