diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-12-01 13:03:24 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-12-01 13:03:24 +0000 |
| commit | 30335ef32ac8d04b4221b5a0988835767f9ea944 (patch) | |
| tree | cb3ca11c661991a736b48f291326a7464512ecf8 | |
| parent | README: add tllist and fcft to list of required libraries (diff) | |
fcft: include <fcft/fcft.h>, and use fcft/stride.h instead of local copy
| -rw-r--r-- | main.c | 2 | ||||
| -rw-r--r-- | render.c | 2 | ||||
| -rw-r--r-- | shm.c | 2 | ||||
| -rw-r--r-- | stride.h | 9 | ||||
| m--------- | subprojects/fcft | 0 | ||||
| -rw-r--r-- | terminal.h | 2 |
6 files changed, 4 insertions, 13 deletions
@@ -10,7 +10,7 @@ #include <sys/sysinfo.h> -#include <fcft.h> +#include <fcft/fcft.h> #define LOG_MODULE "main" #define LOG_ENABLE_DBG 0 @@ -10,7 +10,7 @@ #include <wayland-cursor.h> #include <xdg-shell.h> -#include <fcft.h> +#include <fcft/fcft.h> #define LOG_MODULE "render" #define LOG_ENABLE_DBG 0 @@ -9,12 +9,12 @@ #include <pixman.h> +#include <fcft/stride.h> #include <tllist.h> #define LOG_MODULE "shm" #define LOG_ENABLE_DBG 0 #include "log.h" -#include "stride.h" static tll(struct buffer) buffers; diff --git a/stride.h b/stride.h deleted file mode 100644 index b2c71a71..00000000 --- a/stride.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include <pixman.h> - -static inline int -stride_for_format_and_width(pixman_format_code_t format, int width) -{ - return (((PIXMAN_FORMAT_BPP(format) * width + 7) / 8 + 4 - 1) & -4); -} diff --git a/subprojects/fcft b/subprojects/fcft -Subproject 6377db4464f9a411c17b681f4a41c36950f1a23 +Subproject 8a5c30d2ffb67b52f139cad1dd3b40d86c65a33 @@ -9,7 +9,7 @@ #include <semaphore.h> #include <tllist.h> -#include <fcft.h> +#include <fcft/fcft.h> //#include "config.h" #include "fdm.h" |
