meta: Refactoring to make room for other parts of the project

This commit is contained in:
Yuki Joou 2023-07-13 14:22:52 +02:00
parent 86bc9dc363
commit ca7e8e5e44
11 changed files with 12 additions and 8 deletions

6
.gitignore vendored
View file

@ -1,5 +1,5 @@
protocol/*.c wayland-protos/*.c
protocol/*.h wayland-protos/*.h
protocol/*.xml wayland-protos/*.xml
*~ *~
convertablet convertablet

View file

@ -2,9 +2,13 @@
set -ex; set -ex;
PROTOCOL_IMPLEMENTATIONS="wayland-protos/wlr-output-management-unstable-v1.c"
SOURCES="main.c output_manager.c accel_monitor.c usb_device_detection.c" SOURCES="main.c output_manager.c accel_monitor.c usb_device_detection.c"
CFLAGS="-std=c2x -Wall -Wextra -pedantic $CFLAGS" CFLAGS="-std=c2x -Wall -Wextra -pedantic $CFLAGS -Iwayland-protos"
LIBS="-lwayland-client -lusb-1.0 protocol/wlr-output-management-unstable-v1.c" LIBS="-lwayland-client -lusb-1.0 $PROTOCOL_IMPLEMENTATIONS"
OUTPUT=convertablet OUTPUT=convertablet
clang $CFLAGS $LIBS $SOURCES -o $OUTPUT SOURCES_PATH=""
for file in $SOURCES; do SOURCES_PATH="$SOURCES_PATH daemon/$file"; done;
clang $CFLAGS $LIBS $SOURCES_PATH -o $OUTPUT

View file

@ -9,7 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "protocol/wlr-output-management-unstable-v1.h" #include "wlr-output-management-unstable-v1.h"
static void head_handle_name(void* data, static void head_handle_name(void* data,
struct zwlr_output_head_v1*, struct zwlr_output_head_v1*,

View file

@ -4,7 +4,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "protocol/wlr-output-management-unstable-v1.h" #include "wlr-output-management-unstable-v1.h"
struct miix_wlr_head { struct miix_wlr_head {
struct zwlr_output_head_v1* wlr_head; struct zwlr_output_head_v1* wlr_head;